[PolicyKit-gnome] Using the generic marshaller from GLib requires GLib >= 2.30

[Michael Biebl <mbiebl src gnome org>]

commit 2adc0ef912c0cad59e25f0510d9d14b1836ac19d
Author: Michael Biebl <biebl debian org>
Date:   Tue Oct 25 17:45:33 2011 +0200

    Using the generic marshaller from GLib requires GLib >= 2.30
    
    Add a configure check and be explicit instead of using NULL.
    
    Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646521
    
    https://bugzilla.gnome.org/show_bug.cgi?id=662682

 configure.ac                   |    5 +++++
 src/Makefile.am                |    2 ++
 src/polkitgnomeauthenticator.c |    2 +-
 3 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 76126e9..c70624b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,11 +122,16 @@ fi
 POLKIT_AGENT_REQUIRED=0.97
 POLKIT_GOBJECT_REQUIRED=0.97
 GTK_REQUIRED=3.0.0
+GLIB_REQUIRED=2.30
 
 PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+PKG_CHECK_MODULES(GLIB, glib2.0 >= $GLIB_REQUIRED)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
 PKG_CHECK_MODULES(POLKIT_AGENT, polkit-agent-1 >= $POLKIT_AGENT_REQUIRED)
 AC_SUBST(POLKIT_AGENT_CFLAGS)
 AC_SUBST(POLKIT_AGENT_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6f12d4c..2067998 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,7 @@ polkit_gnome_authentication_agent_1_CPPFLAGS = 		\
 
 polkit_gnome_authentication_agent_1_CFLAGS = 		\
 	$(GTK_CFLAGS)					\
+	$(GLIB_CFLAGS)					\
 	$(GCONF_CFLAGS)					\
 	$(POLKIT_AGENT_CFLAGS)				\
 	$(POLKIT_GOBJECT_CFLAGS)			\
@@ -35,6 +36,7 @@ polkit_gnome_authentication_agent_1_LDFLAGS = 		\
 
 polkit_gnome_authentication_agent_1_LDADD = 		\
 	$(GTK_LIBS)					\
+	$(GLIB_LIBS)					\
 	$(GCONF_LIBS)					\
 	$(POLKIT_AGENT_LIBS)				\
 	$(POLKIT_GOBJECT_LIBS)				\
diff --git a/src/polkitgnomeauthenticator.c b/src/polkitgnomeauthenticator.c
index 3eeb604..23163b4 100644
--- a/src/polkitgnomeauthenticator.c
+++ b/src/polkitgnomeauthenticator.c
@@ -137,7 +137,7 @@ polkit_gnome_authenticator_class_init (PolkitGnomeAuthenticatorClass *klass)
                                             0,                      /* class offset     */
                                             NULL,                   /* accumulator      */
                                             NULL,                   /* accumulator data */
-                                            NULL, /* use generic marshaller */
+                                            g_cclosure_marshal_generic,
                                             G_TYPE_NONE,
                                             2,
                                             G_TYPE_BOOLEAN,