[gnome-bluetooth] lib: Remove killswitch functionality



commit f9a2d4e8a4ed47cad2d30534f53be1e33c17091e
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Nov 28 16:46:49 2013 +0100

    lib: Remove killswitch functionality
    
    That code has now moved to gnome-settings-daemon's Rfkill interface.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=719564

 docs/reference/libgnome-bluetooth/Makefile.am |    4 +-
 lib/Makefile.am                               |   15 +-
 lib/bluetooth-killswitch.c                    |  387 -------------------------
 lib/bluetooth-killswitch.h                    |   78 -----
 lib/gnome-bluetooth.symbols                   |    6 -
 lib/rfkill-glib.c                             |  299 -------------------
 lib/rfkill-glib.h                             |   65 ----
 lib/rfkill.h                                  |  107 -------
 lib/test-killswitch.c                         |   33 --
 9 files changed, 5 insertions(+), 989 deletions(-)
---
diff --git a/docs/reference/libgnome-bluetooth/Makefile.am b/docs/reference/libgnome-bluetooth/Makefile.am
index 9c4e24f..59a5eb4 100644
--- a/docs/reference/libgnome-bluetooth/Makefile.am
+++ b/docs/reference/libgnome-bluetooth/Makefile.am
@@ -62,9 +62,7 @@ IGNORE_HFILES= \
         gnome-bluetooth-enum-types.h    \
         bluetooth-chooser-private.h     \
         bluetooth-client-glue.h         \
-        bluetooth-fdo-glue.h            \
-        rfkill-glib.h                   \
-        rfkill.h
+        bluetooth-fdo-glue.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a1253dd..68983ae 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,15 +8,13 @@ libgnome_bluetooth_c_sources =                \
        bluetooth-client.c              \
        bluetooth-utils.c               \
        bluetooth-agent.c               \
-       bluetooth-killswitch.c          \
        gnome-bluetooth-enum-types.c    \
        bluetooth-chooser.c             \
        bluetooth-filter-widget.c       \
        bluetooth-chooser-button.c      \
        bluetooth-chooser-combo.c       \
        bluetooth-client-glue.c         \
-       bluetooth-fdo-glue.c            \
-       rfkill-glib.c
+       bluetooth-fdo-glue.c
 
 libgnome_bluetooth_private_headers =   \
        bluetooth-client-private.h      \
@@ -24,9 +22,7 @@ libgnome_bluetooth_private_headers =  \
        gnome-bluetooth-enum-types.h    \
        bluetooth-chooser-private.h     \
        bluetooth-client-glue.h         \
-       bluetooth-fdo-glue.h            \
-       rfkill-glib.h                   \
-       rfkill.h
+       bluetooth-fdo-glue.h
 
 # public headers don't need to be listed, are handled by _HEADERS
 libgnome_bluetooth_la_SOURCES =                        \
@@ -48,8 +44,7 @@ libgnome_bluetooth_introspect_headers =                       \
        bluetooth-chooser-combo.h                       \
        bluetooth-filter-widget.h                       \
        bluetooth-enums.h                               \
-       bluetooth-utils.h                               \
-       bluetooth-killswitch.h
+       bluetooth-utils.h
 
 gnomebluetoothdir = $(pkgincludedir)
 gnomebluetooth_HEADERS = $(libgnome_bluetooth_introspect_headers)
@@ -99,7 +94,7 @@ BUILT_SOURCES = bluetooth-client-glue.h \
 
 CLEANFILES += $(BUILT_SOURCES)
 
-noinst_PROGRAMS = test-client test-agent test-deviceselection test-class test-killswitch
+noinst_PROGRAMS = test-client test-agent test-deviceselection test-class
 
 test_client_LDADD = libgnome-bluetooth.la $(LIBGNOMEBT_LIBS)
 
@@ -109,8 +104,6 @@ test_deviceselection_LDADD = libgnome-bluetooth.la $(LIBGNOMEBT_LIBS)
 
 test_class_LDADD = libgnome-bluetooth.la $(LIBGNOMEBT_LIBS)
 
-test_killswitch_LDADD = libgnome-bluetooth.la $(LIBGNOMEBT_LIBS)
-
 EXTRA_DIST += bluetooth-client.xml bluetooth-fdo.xml gnome-bluetooth.symbols
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/lib/gnome-bluetooth.symbols b/lib/gnome-bluetooth.symbols
index 85ad70a..c5433d2 100644
--- a/lib/gnome-bluetooth.symbols
+++ b/lib/gnome-bluetooth.symbols
@@ -46,12 +46,6 @@ bluetooth_filter_widget_get_type
 bluetooth_filter_widget_bind_filter
 bluetooth_chooser_combo_get_type
 bluetooth_chooser_combo_new
-bluetooth_killswitch_get_type
-bluetooth_killswitch_new
-bluetooth_killswitch_has_killswitches
-bluetooth_killswitch_set_state
-bluetooth_killswitch_get_state
-bluetooth_killswitch_state_to_string
 bluetooth_agent_new
 bluetooth_agent_set_pincode_func
 bluetooth_agent_register


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