[gnome-bluetooth] applet: Fix build problems with marshallers

[Bastien Nocera <hadess src gnome org>]

commit c6d4160b4fe208b2edc6fd832517442aaa671406
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Oct 17 11:10:22 2011 +0100

    applet: Fix build problems with marshallers
    
    Use the generic marshallers, instead of bothering with
    creating our own.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=661803

 applet/Makefile-lib.am    |   12 +-----------
 applet/bluetooth-applet.c |   12 +++++-------
 configure.ac              |    2 +-
 3 files changed, 7 insertions(+), 19 deletions(-)
---
diff --git a/applet/Makefile-lib.am b/applet/Makefile-lib.am
index 7f8a43e..44f9de8 100644
--- a/applet/Makefile-lib.am
+++ b/applet/Makefile-lib.am
@@ -1,13 +1,11 @@
 CLEANFILES =
 EXTRA_DIST =
-BUILT_SOURCES = marshal.h marshal.c
 
 pkglib_LTLIBRARIES = libgnome-bluetooth-applet.la
 
 libgnome_bluetooth_applet_la_SOURCES = 	\
 	bluetooth-applet.c		\
-	bluetooth-applet.h		\
-	marshal.c
+	bluetooth-applet.h
 
 libgnome_bluetooth_applet_la_LIBADD = $(LIBGNOMEBT_LIBS) $(top_builddir)/lib/libcommon.la
 
@@ -15,14 +13,6 @@ libgnome_bluetooth_applet_la_LDFLAGS = -no-undefined
 
 AM_CFLAGS = -I$(srcdir) -I$(top_srcdir)/lib $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
-marshal.h: marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=marshal $< --header > $@
-
-marshal.c: marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=marshal $< --header --body > $@
-
-EXTRA_DIST += marshal.list
-
 include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
diff --git a/applet/bluetooth-applet.c b/applet/bluetooth-applet.c
index 5894012..a68223f 100644
--- a/applet/bluetooth-applet.c
+++ b/applet/bluetooth-applet.c
@@ -32,8 +32,6 @@
 #include <bluetooth-killswitch.h>
 #include <bluetooth-agent.h>
 
-#include <marshal.h>
-
 static gpointer
 bluetooth_simple_device_copy (gpointer boxed)
 {
@@ -1002,23 +1000,23 @@ bluetooth_applet_class_init (BluetoothAppletClass *klass)
 	g_object_class_install_property (gobject_class, PROP_FULL_MENU, properties[PROP_FULL_MENU]);
 
 	signals[SIGNAL_DEVICES_CHANGED] = g_signal_new ("devices-changed", G_TYPE_FROM_CLASS (gobject_class),
-							G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID,
+							G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, 0, NULL, NULL, NULL,
 							G_TYPE_NONE, 0);
 
 	signals[SIGNAL_PINCODE_REQUEST] = g_signal_new ("pincode-request", G_TYPE_FROM_CLASS (gobject_class),
-							G_SIGNAL_RUN_FIRST, 0, NULL, NULL, marshal_VOID__STRING_STRING_STRING_BOOLEAN,
+							G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL,
 							G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
 	signals[SIGNAL_CONFIRM_REQUEST] = g_signal_new ("confirm-request", G_TYPE_FROM_CLASS (gobject_class),
-							G_SIGNAL_RUN_FIRST, 0, NULL, NULL, marshal_VOID__STRING_STRING_STRING_UINT,
+							G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL,
 							G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
 
 	signals[SIGNAL_AUTHORIZE_REQUEST] = g_signal_new ("auth-request", G_TYPE_FROM_CLASS (gobject_class),
-							  G_SIGNAL_RUN_FIRST, 0, NULL, NULL, marshal_VOID__STRING_STRING_STRING_STRING,
+							  G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL,
 							  G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 
 	signals[SIGNAL_CANCEL_REQUEST] = g_signal_new ("cancel-request", G_TYPE_FROM_CLASS (gobject_class),
-						       G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID,
+						       G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL,
 						       G_TYPE_NONE, 0);
 }
 
diff --git a/configure.ac b/configure.ac
index e9c927d..d426401 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ fi
 AM_CONDITIONAL([ICON_UPDATE], [test -n "$UPDATE_ICON_CACHE"])
 
 GTK_REQUIRED=2.91.3
-GLIB_REQUIRED=2.25.7
+GLIB_REQUIRED=2.29.90
 NOTIFY_REQUIRED=0.7.0
 NAUTILUS_SENDTO_REQUIRED=2.29.0
 NAUTILUS_SENDTO_MAX_REQUIRED=3.1.0