[network-manager-applet/danw/libnm-bgo736911: 3/17] gnome-bluetooth: Drop the gnome-bluetooth plugin



commit eb36da69d35c95c84a4aaf12ba5983b0c1b4192f
Author: Dan Winship <danw redhat com>
Date:   Mon Nov 24 16:52:33 2014 -0500

    gnome-bluetooth: Drop the gnome-bluetooth plugin
    
    The current version of gnome-bluetooth does not support plugins, so
    there's no reason to keep this around any more.

 configure.ac                        |   18 -
 po/POTFILES.in                      |    2 -
 src/Makefile.am                     |    2 +-
 src/gnome-bluetooth/Makefile.am     |   36 --
 src/gnome-bluetooth/bt-widget.c     |  604 -------------------
 src/gnome-bluetooth/nma-bt-device.c | 1123 -----------------------------------
 src/gnome-bluetooth/nma-bt-device.h |   84 ---
 7 files changed, 1 insertions(+), 1868 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 16bd67d..6843823 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,23 +100,6 @@ AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
 
-dnl Check for gnome-bluetooth
-AC_ARG_WITH([bluetooth],
-           AS_HELP_STRING([--with-bluetooth|--without-bluetooth], [Enable Bluetooth support]),
-           with_bluetooth="$withval",with_bluetooth=yes)
-have_gbt=no
-case "${with_bluetooth}" in
-       no)     AC_MSG_NOTICE(Bluetooth support disabled)
-               ;;
-       *)
-               PKG_CHECK_MODULES(GNOME_BLUETOOTH,
-                                 gnome-bluetooth-1.0 >= 2.27.6
-                                 gnome-bluetooth-1.0 < 3.11.0
-                                 libnm-util libnm-glib,
-                                 have_gbt=yes, have_gbt=no)
-               ;;
-esac
-
 AC_ARG_WITH([appindicator], AS_HELP_STRING([--with-appindicator|--without-appindicator], [Build with 
libappindicator support instead of xembed systray support.]))
 if test "$with_appindicator" == "yes"; then
        PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1)
@@ -180,7 +163,6 @@ src/utils/Makefile
 src/utils/tests/Makefile
 src/wireless-security/Makefile
 src/connection-editor/Makefile
-src/gnome-bluetooth/Makefile
 icons/Makefile
 icons/16/Makefile
 icons/22/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5df683a..d8d30fa 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -73,8 +73,6 @@ src/connection-editor/page-wifi-security.c
 src/connection-editor/page-wimax.c
 src/connection-editor/vpn-helpers.c
 src/ethernet-dialog.c
-src/gnome-bluetooth/bt-widget.c
-src/gnome-bluetooth/nma-bt-device.c
 [type: gettext/glade]src/gsm-unlock.ui
 [type: gettext/glade]src/info.ui
 src/libnm-gtk/nm-mobile-wizard.c
diff --git a/src/Makefile.am b/src/Makefile.am
index d66c9d0..2aad0bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = utils wireless-security libnm-gtk connection-editor gnome-bluetooth
+SUBDIRS = utils wireless-security libnm-gtk connection-editor
 
 bin_PROGRAMS = nm-applet
 


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