Commit 844dd9e3 authored by Bastien Nocera's avatar Bastien Nocera

bluetooth: Move Bluetooth panel from gnome-bluetooth

parent 6d382165
......@@ -142,6 +142,11 @@ if test "x$have_networkmanager" = xno ; then
fi
AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
# Check for gnome-bluetooth
PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.3.0,
[have_bluetooth=yes], have_bluetooth=no)
AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
# Check for CUPS 1.4 or newer
AC_ARG_ENABLE([cups],
AS_HELP_STRING([--disable-cups], [disable CUPS support (default: enabled)]),,
......@@ -315,6 +320,8 @@ panels/Makefile
panels/common/Makefile
panels/background/Makefile
panels/background/gnome-background-panel.desktop.in
panels/bluetooth/Makefile
panels/bluetooth/bluetooth-properties.desktop.in
panels/datetime/Makefile
panels/datetime/gnome-datetime-panel.desktop.in
panels/datetime/po-timezones/Makefile
......
......@@ -24,4 +24,8 @@ if BUILD_NETWORK
SUBDIRS += network
endif
if BUILD_BLUETOOTH
SUBDIRS += bluetooth
endif
-include $(top_srcdir)/git.mk
# This is used in PANEL_CFLAGS
cappletname = bluetooth
ccpanelsdir = $(PANELS_DIR)
ccpanels_LTLIBRARIES = libbluetooth.la
INCLUDES = \
$(PANEL_CFLAGS) \
$(BLUETOOTH_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DPKGDATADIR="\"$(pkgdatadir)\"" \
$(NULL)
libbluetooth_la_SOURCES = \
cc-bluetooth-panel.c \
cc-bluetooth-panel.h
libbluetooth_la_LIBADD = $(PANEL_LIBS) $(BLUETOOTH_LIBS)
libbluetooth_la_LDFLAGS = $(PANEL_LDFLAGS)
desktopdir = $(datadir)/applications
desktop_in_in_files = bluetooth-properties.desktop.in.in
desktop_in_files = bluetooth-properties.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
ui_DATA = bluetooth.ui
uidir = $(pkgdatadir)
CLEANFILES = $(desktop_DATA)
EXTRA_DIST = $(man_MANS) $(desktop_in_in_files) $(ui_DATA)
-include $(top_srcdir)/git.mk
[Desktop Entry]
_Name=Bluetooth
_Comment=Configure Bluetooth settings
Icon=bluetooth
Exec=gnome-control-center bluetooth
Terminal=false
Type=Application
Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-GNOME-Settings-Panel;
OnlyShowIn=GNOME;XFCE;
StartupNotify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-bluetooth
X-GNOME-Bugzilla-Component=properties
X-GNOME-Bugzilla-Version=@VERSION@
X-GNOME-Settings-Panel=bluetooth
This diff is collapsed.
This diff is collapsed.
/*
*
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2005-2008 Marcel Holtmann <marcel@holtmann.org>
* Copyright (C) 2006-2010 Bastien Nocera <hadess@hadess.net>
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#ifndef _CC_BLUETOOTH_PANEL_H
#define _CC_BLUETOOTH_PANEL_H
#include <libgnome-control-center/cc-shell.h>
G_BEGIN_DECLS
#define CC_TYPE_BLUETOOTH_PANEL cc_bluetooth_panel_get_type()
#define CC_BLUETOOTH_PANEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CC_TYPE_BLUETOOTH_PANEL, CcBluetoothPanel))
#define CC_BLUETOOTH_PANEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CC_TYPE_BLUETOOTH_PANEL, CcBluetoothPanelClass))
#define CC_IS_BLUETOOTH_PANEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CC_TYPE_BLUETOOTH_PANEL))
#define CC_IS_BLUETOOTH_PANEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CC_TYPE_BLUETOOTH_PANEL))
#define CC_BLUETOOTH_PANEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CC_TYPE_BLUETOOTH_PANEL, CcBluetoothPanelClass))
typedef struct CcBluetoothPanel CcBluetoothPanel;
typedef struct CcBluetoothPanelClass CcBluetoothPanelClass;
typedef struct CcBluetoothPanelPrivate CcBluetoothPanelPrivate;
struct CcBluetoothPanel {
CcPanel parent;
CcBluetoothPanelPrivate *priv;
};
struct CcBluetoothPanelClass {
CcPanelClass parent_class;
};
GType cc_bluetooth_panel_get_type (void) G_GNUC_CONST;
void cc_bluetooth_panel_register (GIOModule *module);
G_END_DECLS
#endif /* _CC_BLUETOOTH_PANEL_H */
......@@ -7,6 +7,9 @@ panels/background/gnome-background-panel.desktop.in.in
panels/background/bg-colors-source.c
panels/background/cc-background-panel.c
panels/background/cc-background-item.c
panels/bluetooth/cc-bluetooth-panel.c
[type: gettext/glade] panels/bluetooth/bluetooth.ui
panels/bluetooth/bluetooth-properties.desktop.in.in
panels/common/cc-common-language.c
panels/common/cc-language-chooser.c
panels/common/gdm-languages.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment