[gnome-bluetooth] properties: Move to gnome-control-center



commit 51c3c32ec34753676497b27504478ad30534ddf7
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Oct 18 18:45:36 2011 +0100

    properties: Move to gnome-control-center
    
    https://bugzilla.gnome.org/show_bug.cgi?id=644219

 Makefile.am                                   |    4 +-
 configure.ac                                  |   13 -
 gnome-bluetooth-1.0.pc.in                     |    2 +-
 po/POTFILES.in                                |    3 -
 properties/Makefile.am                        |   33 -
 properties/bluetooth-properties.desktop.in.in |   15 -
 properties/bluetooth.ui                       |  673 --------------------
 properties/cc-bluetooth-panel.c               |  844 -------------------------
 properties/cc-bluetooth-panel.h               |   59 --
 properties/cut-n-paste/Makefile.am            |    3 -
 properties/cut-n-paste/cc-panel.h             |   81 ---
 properties/cut-n-paste/cc-shell.h             |  107 ----
 12 files changed, 3 insertions(+), 1834 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f73baf4..9111350 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
-DEF_SUBDIRS = icons lib applet properties wizard sendto docs po help
+DEF_SUBDIRS = icons lib applet wizard sendto docs po help
 
 if WITH_MOBLIN
 MOBLIN_DIR = moblin
 endif
 
-SUBDIRS = icons lib applet properties wizard sendto $(MOBLIN_DIR) docs po help
+SUBDIRS = icons lib applet wizard sendto $(MOBLIN_DIR) docs po help
 
 DIST_SUBDIRS = $(DEF_SUBDIRS) moblin
 EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make
diff --git a/configure.ac b/configure.ac
index e29d916..2f52230 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,16 +78,6 @@ NOTIFY_REQUIRED=0.7.0
 NAUTILUS_SENDTO_REQUIRED=2.29.0
 NAUTILUS_SENDTO_MAX_REQUIRED=3.1.0
 
-dnl Requires for the properties window
-PANELS_DIR="${libdir}/control-center-1/panels"
-AC_SUBST(PANELS_DIR)
-
-dnl Missing libgnome-control-center
-dnl which will be resolved at run-time
-PKG_CHECK_MODULES(PROPS,
-		  glib-2.0 >= $GLIB_REQUIRED
-		  gtk+-3.0 >= 2.90.7)
-
 dnl Requires for the applet
 PKG_CHECK_MODULES(APPLET,
 		  gmodule-export-2.0
@@ -204,9 +194,6 @@ AC_OUTPUT(Makefile
 	  lib/plugins/Makefile
 	  applet/Makefile
 	  applet/bluetooth-applet.desktop.in
-	  properties/Makefile
-	  properties/bluetooth-properties.desktop.in
-	  properties/cut-n-paste/Makefile
 	  wizard/Makefile
 	  wizard/bluetooth-wizard.desktop.in
 	  sendto/Makefile
diff --git a/gnome-bluetooth-1.0.pc.in b/gnome-bluetooth-1.0.pc.in
index 888063e..b48f72f 100644
--- a/gnome-bluetooth-1.0.pc.in
+++ b/gnome-bluetooth-1.0.pc.in
@@ -8,6 +8,6 @@ applet_libs=-Wl,--rpath=${applet_libdir} -L${applet_libdir} -lgnome-bluetooth-ap
 Name: gnome-bluetooth-1.0
 Description: Widgets for Bluetooth device selection
 Version: @VERSION@
-Requires: gtk+-3.0
+Requires: gtk+-3.0 gio-2.0
 Libs: -L${libdir} -lgnome-bluetooth
 Cflags: -I${includedir}/gnome-bluetooth
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f77ffb8..08f033a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,9 +14,6 @@ applet/bluetooth-applet.desktop.in.in
 [type: gettext/glade] applet/authorisation-dialogue.ui
 [type: gettext/glade] applet/confirm-dialogue.ui
 [type: gettext/glade] applet/passkey-dialogue.ui
-properties/cc-bluetooth-panel.c
-[type: gettext/glade] properties/bluetooth.ui
-properties/bluetooth-properties.desktop.in.in
 wizard/main.c
 [type: gettext/glade] wizard/wizard.ui
 wizard/bluetooth-wizard.desktop.in.in



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]