[network-manager-applet/danw/libnm-bgo736911: 3/9] gnome-bluetooth: Drop the gnome-bluetooth plugin
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/danw/libnm-bgo736911: 3/9] gnome-bluetooth: Drop the gnome-bluetooth plugin
- Date: Tue, 27 Jan 2015 22:10:27 +0000 (UTC)
commit 1281b03441cb63f9a787cf00f89291433f99fa56
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 | 20 -
po/POTFILES.in | 2 -
src/Makefile.am | 2 +-
src/gnome-bluetooth/Makefile.am | 43 --
src/gnome-bluetooth/bt-widget.c | 604 ----------------
src/gnome-bluetooth/nma-bt-device.c | 1283 -----------------------------------
src/gnome-bluetooth/nma-bt-device.h | 84 ---
7 files changed, 1 insertions(+), 2037 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 43176be..d60ceef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,25 +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
-
-AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
-
dnl ModemManager1 with libmm-glib
AC_ARG_WITH(modem-manager-1, AS_HELP_STRING([--with-modem-manager-1], [Enable new ModemManager1 interface
support]),,[with_modem_manager_1=auto])
if (test "${with_modem_manager_1}" != "no"); then
@@ -174,7 +155,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 f3c148e..f8e10d1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -74,8 +74,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 011cfff..3979495 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]