[gnome-panel] libpanel-util: adjust to DConf API changes

[Colin Walters <walters src gnome org>]

commit 815246a3e297ba60694b20070af1324942f5f08b
Author: Ryan Lortie <desrt desrt ca>
Date:   Sun Jul 15 14:52:07 2012 -0400

    libpanel-util: adjust to DConf API changes
    
    The libdconf API is unstable and just underwent some changes.  Adjust to
    those.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=679971

 configure.ac                            |    3 ++-
 gnome-panel/libpanel-util/panel-dconf.c |   11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index abaa432..9f9172b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,12 +77,13 @@ LIBEDATASERVER_REQUIRED=3.5.3
 CAIRO_REQUIRED=1.0.0
 GWEATHER_REQUIRED=3.5.1
 DBUS_GLIB_REQUIRED=0.80
+DCONF_REQUIRED=0.13.4
 
 dnl pkg-config dependency checks
 
 PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-3.0)
 
-PKG_CHECK_MODULES(PANEL, gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf)
+PKG_CHECK_MODULES(PANEL, gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf >= $DCONF_REQUIRED)
 AC_SUBST(PANEL_CFLAGS)
 AC_SUBST(PANEL_LIBS)
 
diff --git a/gnome-panel/libpanel-util/panel-dconf.c b/gnome-panel/libpanel-util/panel-dconf.c
index 6d09dd6..0982f8e 100644
--- a/gnome-panel/libpanel-util/panel-dconf.c
+++ b/gnome-panel/libpanel-util/panel-dconf.c
@@ -24,15 +24,14 @@
 
 #include <string.h>
 
-#include <dconf-client.h>
-#include <dconf-paths.h>
+#include <dconf.h>
 
 #include "panel-dconf.h"
 
 static DConfClient *
 panel_dconf_client_get (void)
 {
-        return dconf_client_new (NULL, NULL, NULL, NULL);
+        return dconf_client_new ();
 }
 
 gboolean
@@ -43,8 +42,7 @@ panel_dconf_write_sync (const gchar  *key,
         gboolean     ret;
         DConfClient *client = panel_dconf_client_get ();
 
-        ret = dconf_client_write (client, key, value,
-                                  NULL, NULL, error);
+        ret = dconf_client_write_sync (client, key, value, NULL, NULL, error);
 
         g_object_unref (client);
 
@@ -58,8 +56,7 @@ panel_dconf_recursive_reset (const gchar  *dir,
         gboolean     ret;
         DConfClient *client = panel_dconf_client_get ();
 
-        ret = dconf_client_write (client, dir, NULL,
-                                  NULL, NULL, error);
+        ret = dconf_client_write_sync (client, dir, NULL, NULL, NULL, error);
 
         g_object_unref (client);