[dconf] use gio, not gdbus-standalone

[Ryan Lortie <ryanl src gnome org>]

commit 41c22f4575973846aef67ad0eb84c38d324894b8
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri May 14 19:08:34 2010 +0200

    use gio, not gdbus-standalone

 configure.ac              |    2 +-
 gsettings/dconfdatabase.c |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index afeef2d..5e358c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AM_SILENT_RULES
 AC_PROG_LIBTOOL
 AC_PROG_CC
 
-PKG_CHECK_MODULES(gio, gio-2.0)
+PKG_CHECK_MODULES(gio, gio-2.0 >= 2.25.4)
 giomodulesdir=`pkg-config --variable=giomoduledir gio-2.0`
 AC_SUBST(giomodulesdir)
 
diff --git a/gsettings/dconfdatabase.c b/gsettings/dconfdatabase.c
index 49a3082..01f983b 100644
--- a/gsettings/dconfdatabase.c
+++ b/gsettings/dconfdatabase.c
@@ -23,8 +23,9 @@
 #include <gio/gsettingsbackend.h>
 #include "dconfdatabase.h"
 
+#include <gio/gio.h>
+
 #include <string.h>
-#include <gdbus/gdbus.h>
 #include "gvdb-reader.h"
 
 typedef struct _Outstanding Outstanding;
@@ -295,7 +296,7 @@ dconf_database_filter_function (GDBusConnection *connection,
 {
   DConfDatabase *database = user_data;
 
-  switch (g_dbus_message_get_type (message))
+  switch (g_dbus_message_get_message_type (message))
     {
     case G_DBUS_MESSAGE_TYPE_METHOD_RETURN:
       return dconf_database_remove_outstanding (database, message,