Retire outdated bluetooth code. (#7482)

- HAVE_BLUETOOTH is never used after it is defined in js/mis/config.js.in
- pkg-config checks for applet_libdir fail since GNOME/gnome-bluetooth@a6cb98e
  gnome-bluetooth only supports being called from the system girepository
- BLUEBERRY_LIBS are not actually linked into the final binaries, since
  they aren't included anywhere and no code calls functions from them.
- Everything seems to be moved over to blueberry anyway.

Author: eli-schwartz

configure.ac

@@ -103,20 +103,6 @@ PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
 PKG_CHECK_MODULES(TRAY, clutter-1.0 gtk+-3.0)
 PKG_CHECK_MODULES(DESKTOP_SCHEMAS, cinnamon-desktop >= 2.4.0)
 
-AC_MSG_CHECKING([for bluetooth support])
-PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
-        [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
-	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
-	 AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
-	 AC_SUBST([BLUETOOTH_DIR],["$BLUETOOTH_DIR"])
-	 AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
-	 AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
-	 AC_SUBST([HAVE_BLUETOOTH],[1])
-	 AC_MSG_RESULT([yes])],
-	[AC_DEFINE([HAVE_BLUETOOTH],[0])
-	 AC_SUBST([HAVE_BLUETOOTH],[0])
-	 AC_MSG_RESULT([no])])
-
 MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin`
 MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin`
 AC_SUBST(MUFFIN_GIR_DIR)

debian/control

@@ -12,14 +12,12 @@ Build-Depends: debhelper (>= 9),
                gvfs-backends,
                gobject-introspection (>= 0.9.2),
                gir1.2-json-1.0,
-               gnome-bluetooth (>= 3.1.0),
                gnome-common,
                libcinnamon-desktop-dev (>= 3.5.0),
                libcroco3-dev (>= 0.6.2),
                libdbus-glib-1-dev,
                libgirepository1.0-dev (>= 0.9.2),
                libglib2.0-dev (>= 2.37.3),
-               libgnome-bluetooth-dev (>= 3.1.0),
                libcinnamon-menu-3-dev,
                libgstreamer1.0-dev,
                libgtk-3-dev (>= 3.9.12),
@@ -68,7 +66,6 @@ Depends: cinnamon-common (= ${source:Version}),
          gir1.2-accountsservice-1.0,
          gir1.2-cinnamondesktop-3.0 (>= 3.5.0),
          gir1.2-gkbd-3.0,
-         gir1.2-gnomebluetooth-1.0,
          gir1.2-keybinder-3.0,
          gir1.2-networkmanager-1.0,
          gir1.2-polkit-1.0,

debian/shlibs.local

@@ -6,7 +6,5 @@ var PACKAGE_NAME = '@PACKAGE_NAME@';
 var PACKAGE_VERSION = '@PACKAGE_VERSION@';
 /* The version of GJS we're linking to */
 var GJS_VERSION = '@GJS_VERSION@';
-/* 1 if gnome-bluetooth is available, 0 otherwise */
-var HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
 /* The system TLS CA list */
 var CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';

js/misc/config.js.in

@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 BUILT_SOURCES =
 CLEANFILES =
 EXTRA_DIST =
@@ -215,7 +215,6 @@ libcinnamon_la_LDFLAGS = $(WARN_LDFLAGS) -avoid-version
 libcinnamon_la_LIBADD =		\
 	-lm			\
 	$(CINNAMON_LIBS)	\
-	$(BLUETOOTH_LIBS)	\
 	libst-1.0.la       	\
 	libtray.la		\
 	$(NULL)
@@ -228,7 +227,7 @@ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
 Cinnamon_0_1_gir_LIBS = libcinnamon.la
 Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
 Cinnamon_0_1_gir_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --include-uninstalled=$(builddir)/St-1.0.gir \
-	--add-include-path=$(MUFFIN_GIR_DIR) $(if $(BLUETOOTH_DIR),-L $(BLUETOOTH_DIR),)
+	--add-include-path=$(MUFFIN_GIR_DIR)
 INTROSPECTION_GIRS += Cinnamon-0.1.gir
 CLEANFILES += Cinnamon-0.1.gir
 

src/Makefile.am

@@ -249,7 +249,7 @@ center_pointer_on_screen ()
   Display *dpy;
   Window root_window;
   Screen *screen;
-  
+
   dpy = XOpenDisplay(0);
   root_window = XRootWindow(dpy, 0);
   XSelectInput(dpy, root_window, KeyReleaseMask);
@@ -310,9 +310,6 @@ main (int argc, char **argv)
   cinnamon_perf_log_init ();
 
   g_irepository_prepend_search_path (CINNAMON_PKGLIBDIR);
-#if HAVE_BLUETOOTH
-  g_irepository_prepend_search_path (BLUETOOTH_DIR);
-#endif
 
   /* Disable debug spew from various libraries */
   g_log_set_handler ("Cvc", G_LOG_LEVEL_DEBUG,

src/main.c

@@ -129,14 +129,6 @@ main(int argc, char **argv)
   clutter_stage_set_title (CLUTTER_STAGE (stage), title);
   g_free (title);
 
-#if HAVE_BLUETOOTH
-  /* The module imports are all so intertwined that if the test
-   * imports anything in js/ui, it will probably eventually end up
-   * pulling in ui/status/bluetooth.js. So we need this.
-   */
-  g_irepository_prepend_search_path (BLUETOOTH_DIR);
-#endif
-
   /* evaluate the script */
   error = NULL;
   if (!gjs_context_eval (js_context, script, len,