[gnome-bluetooth] applet: Remove fallback applet

[Bastien Nocera <hadess src gnome org>]

commit c54e93e4310342ffce13e15b5a1b9a6ee9500a05
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Nov 9 15:28:56 2012 +0100

    applet: Remove fallback applet
    
    As fallback is now obsolete. #fallback
    
    https://bugzilla.gnome.org/show_bug.cgi?id=682860

 applet/Makefile-lib.am                |   40 --
 applet/Makefile.am                    |   59 ++--
 applet/agent.c                        |  481 ------------------
 applet/agent.h                        |   29 --
 applet/authorisation-dialogue.ui      |   93 ----
 applet/bluetooth-applet.1             |   30 --
 applet/bluetooth-applet.desktop.in.in |   14 -
 applet/confirm-dialogue.ui            |   80 ---
 applet/main.c                         |  894 ---------------------------------
 applet/marshal.list                   |    3 -
 applet/notify.c                       |  170 -------
 applet/notify.h                       |   35 --
 applet/passkey-dialogue.ui            |   67 ---
 applet/popup-menu.ui                  |  106 ----
 applet/test-agentdialog.c             |   67 ---
 applet/test-icon.c                    |   39 --
 configure.ac                          |   10 +-
 po/POTFILES.in                        |    8 -
 18 files changed, 31 insertions(+), 2194 deletions(-)
---
diff --git a/applet/Makefile.am b/applet/Makefile.am
index 961e19f..251575d 100644
--- a/applet/Makefile.am
+++ b/applet/Makefile.am
@@ -1,39 +1,40 @@
-include Makefile-lib.am
+CLEANFILES =
+EXTRA_DIST =
 
-bin_PROGRAMS = bluetooth-applet
+pkglib_LTLIBRARIES = libgnome-bluetooth-applet.la
 
-bluetooth_applet_SOURCES = main.c notify.h notify.c agent.h agent.c
+libgnome_bluetooth_applet_la_SOURCES = 	\
+	bluetooth-applet.c		\
+	bluetooth-applet.h
 
-bluetooth_applet_LDADD = $(top_builddir)/lib/libgnome-bluetooth.la $(builddir)/libgnome-bluetooth-applet.la $(APPLET_LIBS)
+libgnome_bluetooth_applet_la_LIBADD = $(LIBGNOMEBT_LIBS) $(top_builddir)/lib/libgnome-bluetooth.la
 
-noinst_PROGRAMS = test-agentdialog test-icon
+libgnome_bluetooth_applet_la_LDFLAGS = -no-undefined
 
-test_agentdialog_SOURCES = test-agentdialog.c notify.h notify.c
-test_agentdialog_LDADD = $(builddir)/libgnome-bluetooth-applet.la $(APPLET_LIBS)
+AM_CFLAGS = -I$(srcdir) -I$(top_srcdir)/lib $(LIBGNOMEBT_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
-test_icon_SOURCES = test-icon.c notify.h notify.c
-test_icon_LDADD = $(APPLET_LIBS)
+install-exec-hook:
+	rm -f $(DESTDIR)$(pkglibdir)/libgnome-bluetooth-applet.la
+uninstall-hook:
+	rm -f $(DESTDIR)$(pkglibdir)/libgnome-bluetooth-applet.so*
 
-AM_CFLAGS += $(APPLET_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\"" -DG_LOG_DOMAIN=\"BluetoothApplet\"
+include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_builddir)/lib
 
-INCLUDES = -I$(top_srcdir)/lib
+if HAVE_INTROSPECTION
+GnomeBluetoothApplet-1.0.gir: libgnome-bluetooth-applet.la
+GnomeBluetoothApplet_1_0_gir_SCANNERFLAGS = --warn-all --symbol-prefix=bluetooth_ --identifier-prefix=Bluetooth --include-uninstalled=$(top_builddir)/lib/GnomeBluetooth-1.0.gir
+GnomeBluetoothApplet_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 GModule-2.0
+GnomeBluetoothApplet_1_0_gir_PACKAGES = gobject-2.0 gtk+-3.0 gmodule-2.0 glib-2.0
+GnomeBluetoothApplet_1_0_gir_CFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/lib
+GnomeBluetoothApplet_1_0_gir_LIBS = libgnome-bluetooth-applet.la
+GnomeBluetoothApplet_1_0_gir_FILES = $(libgnome_bluetooth_applet_la_SOURCES) ../lib/bluetooth-enums.h
+INTROSPECTION_GIRS += GnomeBluetoothApplet-1.0.gir
 
-man_MANS = bluetooth-applet.1
+typelibdir = $(pkglibdir)
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-ui_DATA = popup-menu.ui authorisation-dialogue.ui confirm-dialogue.ui passkey-dialogue.ui
-uidir = $(pkgdatadir)
-
-autostartdir = $(sysconfdir)/xdg/autostart
-
-autostart_in_in_files = bluetooth-applet.desktop.in.in
-autostart_in_files = bluetooth-applet.desktop.in
-
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-
- INTLTOOL_DESKTOP_RULE@
-
-CLEANFILES += $(autostart_DATA)
-
-EXTRA_DIST += $(man_MANS) $(autostart_in_in_files) $(ui_DATA)
-
-MAINTAINERCLEANFILES = Makefile.in
+CLEANFILES += $(typelib_DATA) $(INTROSPECTION_GIRS)
+endif # HAVE_INTROSPECTION
diff --git a/configure.ac b/configure.ac
index c104516..bd38c4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_INIT([gnome-bluetooth],
         [gnomebt_version_major.gnomebt_version_minor.gnomebt_version_micro],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-bluetooth])
 
-AC_CONFIG_SRCDIR([applet/main.c])
+AC_CONFIG_SRCDIR([applet/bluetooth-applet.c])
 AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([1.8 dist-xz no-dist-gzip check-news tar-ustar])
@@ -78,13 +78,6 @@ NOTIFY_REQUIRED=0.7.0
 NAUTILUS_SENDTO_REQUIRED=2.29.0
 NAUTILUS_SENDTO_MAX_REQUIRED=3.7.0
 
-dnl Requires for the applet
-PKG_CHECK_MODULES(APPLET,
-		  gmodule-export-2.0
-		  glib-2.0 >= $GLIB_REQUIRED
-		  gtk+-3.0 >= $GTK_REQUIRED
-		  libnotify >= $NOTIFY_REQUIRED)
-
 dnl Requires for the sendto app
 PKG_CHECK_MODULES(SENDTO,
 		  gtk+-3.0
@@ -159,7 +152,6 @@ AC_OUTPUT(Makefile
 	  lib/Makefile
 	  lib/plugins/Makefile
 	  applet/Makefile
-	  applet/bluetooth-applet.desktop.in
 	  wizard/Makefile
 	  wizard/bluetooth-wizard.desktop.in
 	  sendto/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5823a01..df1dd2f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,14 +6,6 @@ lib/bluetooth-filter-widget.c
 lib/bluetooth-utils.c
 lib/plugins/geoclue.c
 lib/plugins/test.c
-applet/main.c
-applet/notify.c
-applet/agent.c
-applet/bluetooth-applet.desktop.in.in
-[type: gettext/glade] applet/popup-menu.ui
-[type: gettext/glade] applet/authorisation-dialogue.ui
-[type: gettext/glade] applet/confirm-dialogue.ui
-[type: gettext/glade] applet/passkey-dialogue.ui
 wizard/main.c
 [type: gettext/glade] wizard/wizard.ui
 wizard/bluetooth-wizard.desktop.in.in