[mate-panel] redo patch for dconf api changes

[leigh123linux]

commit d08d7f6b5f91b66fe5a5e63459640dcfe838b77c
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Oct 29 17:12:56 2012 +0000

    redo patch for dconf api changes

 dconf_api.patch |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)
---
diff --git a/dconf_api.patch b/dconf_api.patch
index f75e50e..7f1570b 100644
--- a/dconf_api.patch
+++ b/dconf_api.patch
@@ -1,29 +1,39 @@
 --- a/mate-panel/libpanel-util/panel-dconf.c
 +++ b/mate-panel/libpanel-util/panel-dconf.c
-@@ -36,7 +36,7 @@
+@@ -32,11 +31,7 @@
  static DConfClient *
  panel_dconf_client_get (void)
  {
 -#ifdef HAVE_DCONF_0_13
-+#ifdef HAVE_DCONF_0_14
          return dconf_client_new ();
- #else
-         return dconf_client_new (NULL, NULL, NULL, NULL);
-@@ -51,7 +51,7 @@ panel_dconf_write_sync (const gchar  *ke
+-#else
+-        return dconf_client_new (NULL, NULL, NULL, NULL);
+-#endif
+ }
+ 
+ gboolean
+@@ -47,11 +42,7 @@ panel_dconf_write_sync (const gchar  *ke
          gboolean     ret;
          DConfClient *client = panel_dconf_client_get ();
  
 -#ifdef HAVE_DCONF_0_13
-+#ifdef HAVE_DCONF_0_14
          ret = dconf_client_write_sync (client, key, value, NULL, NULL, error);
- #else
-         ret = dconf_client_write (client, key, value, NULL, NULL, error);
-@@ -69,7 +69,7 @@ panel_dconf_recursive_reset (const gchar
+-#else
+-        ret = dconf_client_write (client, key, value, NULL, NULL, error);
+-#endif
+ 
+         g_object_unref (client);
+ 
+@@ -65,11 +56,7 @@ panel_dconf_recursive_reset (const gchar
          gboolean     ret;
          DConfClient *client = panel_dconf_client_get ();
  
 -#ifdef HAVE_DCONF_0_13
-+#ifdef HAVE_DCONF_0_14
          ret = dconf_client_write_sync (client, dir, NULL, NULL, NULL, error);
- #else
-         ret = dconf_client_write (client, dir, NULL, NULL, NULL, error);
+-#else
+-        ret = dconf_client_write (client, dir, NULL, NULL, NULL, error);
+-#endif
+ 
+         g_object_unref (client);
+ 
+