[dconf] Update to latest GDBus ABI

[David Zeuthen <davidz src gnome org>]

commit 023f6a1049c7c11b999d27ba1e349f69ce90a2d3
Author: David Zeuthen <davidz redhat com>
Date:   Thu Sep 9 17:39:19 2010 -0400

    Update to latest GDBus ABI
    
    The GDBus filter ABI has been changed, see
    
     http://git.gnome.org/browse/glib/commit/?id=c3371efcaa47b03941c6c8148687b0a21d18dfbe
    
    for details.
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 configure.ac                     |    2 +-
 gsettings/dconfsettingsbackend.c |   19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 12b00a4..68349e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ GOBJECT_INTROSPECTION_CHECK([0.9.3])
 GTK_DOC_CHECK([1.15])
 
 # Dependencies
-PKG_CHECK_MODULES(gio, gio-2.0 >= 2.25.12)
+PKG_CHECK_MODULES(gio, gio-2.0 >= 2.25.16)
 
 AC_ARG_ENABLE(editor,
               AC_HELP_STRING([--disable-editor],
diff --git a/gsettings/dconfsettingsbackend.c b/gsettings/dconfsettingsbackend.c
index 4170a52..841e14e 100644
--- a/gsettings/dconfsettingsbackend.c
+++ b/gsettings/dconfsettingsbackend.c
@@ -98,7 +98,7 @@ dconf_settings_backend_new_outstanding (DConfSettingsBackend *dcsb,
   return &outstanding->serial;
 }
 
-static GDBusMessageFilterResult
+static gboolean
 dconf_settings_backend_remove_outstanding (DConfSettingsBackend  *dcsb,
                                            guint                  bus_type,
                                            GDBusMessage          *message,
@@ -162,9 +162,7 @@ dconf_settings_backend_remove_outstanding (DConfSettingsBackend  *dcsb,
 
   g_static_mutex_unlock (&dcsb->lock);
 
-  return found ?
-    G_DBUS_MESSAGE_FILTER_RESULT_MESSAGE_CONSUMED :
-    G_DBUS_MESSAGE_FILTER_RESULT_NO_EFFECT;
+  return found;
 }
 
 static gboolean
@@ -278,7 +276,7 @@ dconf_settings_backend_incoming_signal (DConfSettingsBackend  *dcsb,
     }
 }
 
-static GDBusMessageFilterResult
+static GDBusMessage *
 dconf_settings_backend_filter (GDBusConnection *connection,
                                GDBusMessage    *message,
                                gboolean         is_incoming,
@@ -308,14 +306,19 @@ dconf_settings_backend_filter (GDBusConnection *connection,
   switch (g_dbus_message_get_message_type (message))
     {
     case G_DBUS_MESSAGE_TYPE_METHOD_RETURN:
-      return dconf_settings_backend_remove_outstanding (dcsb, bus_type,
-                                                        message, ae);
+      if (dconf_settings_backend_remove_outstanding (dcsb, bus_type,
+                                                     message, ae))
+        {
+          /* consume message */
+          g_object_unref (message);
+          return NULL;
+        }
 
     case G_DBUS_MESSAGE_TYPE_SIGNAL:
       dconf_settings_backend_incoming_signal (dcsb, bus_type, message, ae);
 
     default:
-      return G_DBUS_MESSAGE_FILTER_RESULT_NO_EFFECT;
+      return message;
     }
 }