Merge lp:~smspillaz/compiz-core/compiz-core.fix_953839 into lp:compiz-core

[Sam Spilsbury]

  Use gconf_client_dir_exists as gconf_client_get_* doesn't set GError if
  the dir doesn't exit in the gconf database.

  Fixes LP#953839

[Tim Penhey (thumper)]

Looks fine to me.

review: Approve

[Daniel van Vugt (vanvugt)]

Looks OK and works OK. Though my compiz-core test environment doesn't exhibit the bug so I can't verify it totally.

review: Approve

=== modified file 'gtk/window-decorator/settings.c'
--- gtk/window-decorator/settings.c	2012-02-20 12:34:50 +0000
+++ gtk/window-decorator/settings.c	2012-03-20 01:21:17 +0000
@@ -148,13 +148,20 @@
 mutter_draggable_border_width_changed (GConfClient *client)
 {
     static const unsigned int default_draggable_border_width = 7;
-    int      new_width;
+    int      new_width = default_draggable_border_width;
     int      width = settings->mutter_draggable_border_width;
     GError   *error = NULL;
 
-    new_width = gconf_client_get_int (client,
-			              MUTTER_DRAGGABLE_BORDER_WIDTH_KEY,
-			              &error);
+    if (gconf_client_dir_exists (client,
+				 MUTTER_GCONF_DIR,
+				 &error))
+    {
+	if (!error)
+	    new_width = gconf_client_get_int (client,
+				              MUTTER_DRAGGABLE_BORDER_WIDTH_KEY,
+				              &error);
+    }
+
     if (error)
     {
 	new_width = default_draggable_border_width;