[gnome-bluetooth] lib: Remove plugins support



commit 074dbf2b7f5a7d110dafb9e5280a4d44011428b3
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Nov 27 15:39:45 2013 +0100

    lib: Remove plugins support
    
    Unused by either the wizard or the settings panel.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=719564

 configure.ac                                       |    8 -
 .../gnome-bluetooth-sections.txt                   |   15 --
 lib/Makefile.am                                    |   13 +-
 lib/bluetooth-plugin-manager.c                     |  179 ---------------
 lib/bluetooth-plugin-manager.h                     |   38 ----
 lib/bluetooth-plugin.h                             |   64 ------
 lib/gnome-bluetooth.symbols                        |    4 -
 lib/plugins/Makefile.am                            |   30 ---
 lib/plugins/geoclue.c                              |  227 --------------------
 lib/plugins/test.c                                 |   70 ------
 lib/test-plugins.c                                 |  105 ---------
 po/POTFILES.in                                     |    2 -
 12 files changed, 2 insertions(+), 753 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5b8783b..fb8a82e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,13 +95,6 @@ PKG_CHECK_MODULES(INPUT, gdk-3.0 gtk+-3.0)
 dnl Requires for the public library
 PKG_CHECK_MODULES(LIBGNOMEBT, gmodule-2.0 gio-unix-2.0 gtk+-3.0)
 
-dnl Requires for the geoclue plugin
-PKG_CHECK_MODULES(GEOCLUE, gio-2.0 gtk+-3.0)
-
-dnl Requires for the plugins
-PKG_CHECK_MODULES(PLUGINS,
-                 gtk+-3.0)
-
 GDBUS_CODEGEN="gdbus-codegen"
 AC_SUBST(GDBUS_CODEGEN)
 
@@ -124,7 +117,6 @@ AC_OUTPUT(Makefile
          gnome-bluetooth-1.0.pc
          icons/Makefile
          lib/Makefile
-         lib/plugins/Makefile
          wizard/Makefile
          wizard/bluetooth-wizard.desktop.in
          sendto/Makefile
diff --git a/docs/reference/libgnome-bluetooth/gnome-bluetooth-sections.txt 
b/docs/reference/libgnome-bluetooth/gnome-bluetooth-sections.txt
index 3b36d31..6272230 100644
--- a/docs/reference/libgnome-bluetooth/gnome-bluetooth-sections.txt
+++ b/docs/reference/libgnome-bluetooth/gnome-bluetooth-sections.txt
@@ -88,21 +88,6 @@ BluetoothType
 </SECTION>
 
 <SECTION>
-<FILE>bluetooth-plugin</FILE>
-GBT_INIT_PLUGIN
-GbtPlugin
-GbtPluginInfo
-</SECTION>
-
-<SECTION>
-<FILE>bluetooth-plugin-manager</FILE>
-bluetooth_plugin_manager_cleanup
-bluetooth_plugin_manager_device_deleted
-bluetooth_plugin_manager_get_widgets
-bluetooth_plugin_manager_init
-</SECTION>
-
-<SECTION>
 <FILE>bluetooth-utils</FILE>
 bluetooth_class_to_type
 bluetooth_send_to_address
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4fb813d..a1253dd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = plugins
-
 EXTRA_DIST = 
 CLEANFILES =
 
@@ -18,7 +16,6 @@ libgnome_bluetooth_c_sources =                \
        bluetooth-chooser-combo.c       \
        bluetooth-client-glue.c         \
        bluetooth-fdo-glue.c            \
-       bluetooth-plugin-manager.c      \
        rfkill-glib.c
 
 libgnome_bluetooth_private_headers =   \
@@ -52,20 +49,16 @@ libgnome_bluetooth_introspect_headers =                     \
        bluetooth-filter-widget.h                       \
        bluetooth-enums.h                               \
        bluetooth-utils.h                               \
-       bluetooth-plugin-manager.h                      \
        bluetooth-killswitch.h
 
 gnomebluetoothdir = $(pkgincludedir)
-gnomebluetooth_HEADERS =                               \
-       $(libgnome_bluetooth_introspect_headers)        \
-       bluetooth-plugin.h
+gnomebluetooth_HEADERS = $(libgnome_bluetooth_introspect_headers)
 
 AM_CFLAGS =                                            \
        -I$(srcdir)                                     \
        $(LIBGNOMEBT_CFLAGS)                            \
        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED)                           \
-       -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" \
        -DG_LOG_DOMAIN=\"Bluetooth\"
 
 -include $(INTROSPECTION_MAKEFILE)
@@ -106,7 +99,7 @@ BUILT_SOURCES = bluetooth-client-glue.h \
 
 CLEANFILES += $(BUILT_SOURCES)
 
-noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class test-killswitch
+noinst_PROGRAMS = test-client test-agent test-deviceselection test-class test-killswitch
 
 test_client_LDADD = libgnome-bluetooth.la $(LIBGNOMEBT_LIBS)
 
@@ -114,8 +107,6 @@ test_agent_LDADD = libgnome-bluetooth.la $(LIBGNOMEBT_LIBS)
 
 test_deviceselection_LDADD = libgnome-bluetooth.la $(LIBGNOMEBT_LIBS)
 
-test_plugins_LDADD = libgnome-bluetooth.la $(LIBGNOMEBT_LIBS)
-
 test_class_LDADD = libgnome-bluetooth.la $(LIBGNOMEBT_LIBS)
 
 test_killswitch_LDADD = libgnome-bluetooth.la $(LIBGNOMEBT_LIBS)
diff --git a/lib/gnome-bluetooth.symbols b/lib/gnome-bluetooth.symbols
index 6d7af64..85ad70a 100644
--- a/lib/gnome-bluetooth.symbols
+++ b/lib/gnome-bluetooth.symbols
@@ -46,10 +46,6 @@ bluetooth_filter_widget_get_type
 bluetooth_filter_widget_bind_filter
 bluetooth_chooser_combo_get_type
 bluetooth_chooser_combo_new
-bluetooth_plugin_manager_init
-bluetooth_plugin_manager_cleanup
-bluetooth_plugin_manager_get_widgets
-bluetooth_plugin_manager_device_deleted
 bluetooth_killswitch_get_type
 bluetooth_killswitch_new
 bluetooth_killswitch_has_killswitches
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0f12bad..894a19b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,8 +4,6 @@ lib/bluetooth-chooser-combo.c
 lib/bluetooth-chooser.c
 lib/bluetooth-filter-widget.c
 lib/bluetooth-utils.c
-lib/plugins/geoclue.c
-lib/plugins/test.c
 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]