Merge lp:~vanvugt/compiz-compizconfig-gconf/fix-979770 into lp:compiz-compizconfig-gconf

[Daniel van Vugt]

Fixed: The config for the Default profile was not copied to the user's
gconf tree unless they had previously logged into the Ubuntu (unity) profile
(LP: #979770)

[Sam Spilsbury (smspillaz)]

review: Approve

[Daniel van Vugt (vanvugt)]

The gconf tree was not being copied because in checkProfile(), lastProfile==currentProfile=="Default". So that meant the code to copy the profile tree was never called.

=== modified file 'src/gconf.c'
--- src/gconf.c	2012-03-19 14:34:30 +0000
+++ src/gconf.c	2012-04-13 05:13:20 +0000
@@ -1876,7 +1876,7 @@
 	return ret;
     }
 
-    return strdup (DEFAULTPROF);
+    return NULL;
 }
 
 static Bool
@@ -1927,7 +1927,8 @@
 	updateCurrentProfileName (currentProfile);
     }
 
-    free (lastProfile);
+    if (lastProfile)
+	free (lastProfile);
 
     return TRUE;
 }
@@ -2069,13 +2070,13 @@
     g_slist_free (data);
 
     name = getCurrentProfileName ();
-    if (strcmp (name, DEFAULTPROF) != 0)
+    if (name && strcmp (name, DEFAULTPROF) != 0)
     {
 	CCSString *str = calloc (1, sizeof (CCSString));
 	str->value = name;
 	ret = ccsStringListAppend (ret, str);
     }
-    else
+    else if (name)
 	free (name);
 
     return ret;