Merge lp:~compiz-team/compiz/compiz.fix_1018602.1 into lp:compiz/0.9.8

[Sam Spilsbury]

Fix minor build failure due to incorrect merge

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'compizconfig/gsettings/src/gsettings.c'
--- compizconfig/gsettings/src/gsettings.c	2012-06-29 08:42:37 +0000
+++ compizconfig/gsettings/src/gsettings.c	2012-06-29 09:15:54 +0000
@@ -33,6 +33,31 @@
 
 #include "gsettings.h"
 
+static gboolean
+compizconfigTypeHasVariantType (CCSSettingType type)
+{
+    gint i = 0;
+
+    static const unsigned int nVariantTypes = 6;
+    static const CCSSettingType variantTypes[] =
+    {
+	TypeString,
+	TypeMatch,
+	TypeColor,
+	TypeBool,
+	TypeInt,
+	TypeFloat
+    };
+
+    for (; i < nVariantTypes; i++)
+    {
+	if (variantTypes[i] == type)
+	    return TRUE;
+    }
+
+    return FALSE;
+}
+
 static void
 valueChanged (GSettings   *settings,
 	      gchar	  *keyname,
@@ -121,10 +146,11 @@
     GList *l = settingsList;
     gchar *schemaName = getSchemaNameForPlugin (plugin);
     GVariant        *writtenPlugins;
+    gsize            writtenPluginsLen;
+    gsize            newWrittenPluginsSize;
+    gchar           **newWrittenPlugins;
     char	    *plug;
-    GVariant        *newWrittenPlugins;
-    GVariantBuilder *newWrittenPluginsBuilder;
-    GVariantIter    *iter;
+    GVariantIter    iter;
     gboolean	    found = FALSE;
 
     while (l)
@@ -143,6 +169,8 @@
 	    return settingsObj;
 	}
 
+	g_free (name);
+
 	l = g_list_next (l);
     }
 
@@ -162,26 +190,31 @@
 
     writtenPlugins = g_settings_get_value (currentProfileSettings, "plugins-with-set-keys");
 
-    newWrittenPluginsBuilder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
+    g_variant_iter_init (&iter, writtenPlugins);
+    newWrittenPluginsSize = g_variant_iter_n_children (&iter);
 
-    iter = g_variant_iter_new (writtenPlugins);
-    while (g_variant_iter_loop (iter, "s", &plug))
+    while (g_variant_iter_loop (&iter, "s", &plug))
     {
-	g_variant_builder_add (newWrittenPluginsBuilder, "s", plug);
-
 	if (!found)
 	    found = (g_strcmp0 (plug, plugin) == 0);
     }
 
     if (!found)
-	g_variant_builder_add (newWrittenPluginsBuilder, "s", plugin);
-
-    newWrittenPlugins = g_variant_new ("as", newWrittenPluginsBuilder);
-    g_settings_set_value (currentProfileSettings, "plugins-with-set-keys", newWrittenPlugins);
-
-    g_variant_iter_free (iter);
-    g_variant_unref (newWrittenPlugins);
-    g_variant_builder_unref (newWrittenPluginsBuilder);
+	newWrittenPluginsSize++;
+
+    newWrittenPlugins = g_variant_dup_strv (writtenPlugins, &writtenPluginsLen);
+
+    if (writtenPluginsLen > newWrittenPluginsSize)
+    {
+	newWrittenPlugins = g_realloc (newWrittenPlugins, (newWrittenPluginsSize + 1) * sizeof (gchar *));
+	newWrittenPlugins[writtenPluginsLen + 1]  = g_strdup (plugin);
+	newWrittenPlugins[newWrittenPluginsSize] = NULL;
+    }
+
+    g_settings_set_strv (currentProfileSettings, "plugins-with-set-keys", (const gchar * const *)newWrittenPlugins);
+
+    g_free (schemaName);
+    g_strfreev (newWrittenPlugins);
 
     return settingsObj;
 }
@@ -215,36 +248,52 @@
 {
     CCSContext   *context = (CCSContext *)user_data;
     char	 *uncleanKeyName;
-    char	 *path;
+    char	 *path, *pathOrig;
     char         *token;
     int          index;
     unsigned int screenNum;
     CCSPlugin    *plugin;
     CCSSetting   *setting;
 
-    g_object_get (G_OBJECT (settings), "path", &path, NULL);
+    g_object_get (G_OBJECT (settings), "path", &pathOrig, NULL);
 
+    path = pathOrig;
     path += strlen (COMPIZ) + 1;
 
     token = strsep (&path, "/"); /* Profile name */
     if (!token)
+    {
+	g_free (pathOrig);
 	return;
+    }
 
     token = strsep (&path, "/"); /* plugins */
     if (!token)
+    {
+	g_free (pathOrig);
 	return;
+    }
 
     token = strsep (&path, "/"); /* plugin */
     if (!token)
+    {
+	g_free (pathOrig);
 	return;
+    }
 
     plugin = ccsFindPlugin (context, token);
     if (!plugin)
+    {
+	g_free (pathOrig);
 	return;
+    }
 
     token = strsep (&path, "/"); /* screen%i */
     if (!token)
+    {
+	g_free (pathOrig);
 	return;
+    }
 
     sscanf (token, "screen%d", &screenNum);
 
@@ -255,6 +304,7 @@
     {
 	printf ("GSettings Backend: unable to find setting %s, for path %s\n", uncleanKeyName, path);
 	free (uncleanKeyName);
+	g_free (pathOrig);
 	return;
     }
 
@@ -272,42 +322,24 @@
     }
 
     free (uncleanKeyName);
+    g_free (pathOrig);
 }
 
 static Bool
 readListValue (CCSSetting *setting)
 {
     GSettings		*settings = getSettingsObjectForCCSSetting (setting);
-    gchar		*variantType;
+    gboolean		hasVariantType;
     unsigned int        nItems, i = 0;
     CCSSettingValueList list = NULL;
     GVariant		*value;
-    GVariantIter	*iter;
+    GVariantIter	iter;
 
     char *cleanSettingName = translateKeyForGSettings (ccsSettingGetName (setting));
     
-    switch (ccsSettingGetInfo (setting)->forList.listType)
-    {
-    case TypeString:
-    case TypeMatch:
-    case TypeColor:
-	variantType = g_strdup ("s");
-	break;
-    case TypeBool:
-	variantType = g_strdup ("b");
-	break;
-    case TypeInt:
-	variantType = g_strdup ("i");
-	break;
-    case TypeFloat:
-	variantType = g_strdup ("d");
-	break;
-    default:
-	variantType = NULL;
-	break;
-    }
+    hasVariantType = compizconfigTypeHasVariantType (ccsSettingGetInfo (setting)->forList.listType);
 
-    if (!variantType)
+    if (!hasVariantType)
 	return FALSE;
 
     value = g_settings_get_value (settings, cleanSettingName);
@@ -317,8 +349,8 @@
 	return TRUE;
     }
 
-    iter = g_variant_iter_new (value);
-    nItems = g_variant_iter_n_children (iter);
+    g_variant_iter_init (&iter, value);
+    nItems = g_variant_iter_n_children (&iter);
 
     switch (ccsSettingGetInfo (setting)->forList.listType)
     {
@@ -326,14 +358,14 @@
 	{
 	    Bool *array = malloc (nItems * sizeof (Bool));
 	    Bool *arrayCounter = array;
+	    gboolean value;
 
 	    if (!array)
 		break;
-	    
-	    /* Reads each item from the variant into the position pointed
-	     * at by arrayCounter */
-	    while (g_variant_iter_loop (iter, variantType, arrayCounter))
-		arrayCounter++;
+
+	    /* Reads each item from the variant into arrayCounter */
+	    while (g_variant_iter_loop (&iter, "b", &value))
+		*arrayCounter++ = value;
 
 	    list = ccsGetValueListFromBoolArray (array, nItems, setting);
 	    free (array);
@@ -343,14 +375,14 @@
 	{
 	    int *array = malloc (nItems * sizeof (int));
 	    int *arrayCounter = array;
+	    gint value;
 
 	    if (!array)
 		break;
-	    
-	    /* Reads each item from the variant into the position pointed
-	     * at by arrayCounter */
-	    while (g_variant_iter_loop (iter, variantType, arrayCounter))
-		arrayCounter++;
+
+	    /* Reads each item from the variant into arrayCounter */
+	    while (g_variant_iter_loop (&iter, "i", &value))
+		*arrayCounter++ = value;
 
 	    list = ccsGetValueListFromIntArray (array, nItems, setting);
 	    free (array);
@@ -360,14 +392,14 @@
 	{
 	    double *array = malloc (nItems * sizeof (double));
 	    double *arrayCounter = array;
+	    gdouble value;
 
 	    if (!array)
 		break;
-	    
-	    /* Reads each item from the variant into the position pointed
-	     * at by arrayCounter */
-	    while (g_variant_iter_loop (iter, variantType, arrayCounter))
-		arrayCounter++;
+
+	    /* Reads each item from the variant into arrayCounter */
+	    while (g_variant_iter_loop (&iter, "d", &value))
+		*arrayCounter++ = value;
 
 	    list = ccsGetValueListFromFloatArray ((float *) array, nItems, setting);
 	    free (array);
@@ -376,24 +408,21 @@
     case TypeString:
     case TypeMatch:
 	{
-	    char **array = calloc (1, (nItems + 1) * sizeof (char *));
-	    char **arrayCounter = array;
+	    gchar **array = g_malloc0 ((nItems + 1) * sizeof (gchar *));
+	    gchar **arrayCounter = array;
+	    gchar *value;
 
 	    if (!array)
-	    {
 		break;
-	    }
-	    
-	    /* Reads each item from the variant into the position pointed
-	     * at by arrayCounter */
-	    while (g_variant_iter_loop (iter, variantType, arrayCounter))
-		arrayCounter++;
+
+	    array[nItems] = NULL;
+
+	    /* Reads each item from the variant into arrayCounter */
+	    while (g_variant_iter_next (&iter, "s", &value))
+		*arrayCounter++ = value;
 
 	    list = ccsGetValueListFromStringArray (array, nItems, setting);
-	    for (i = 0; i < nItems; i++)
-		if (array[i])
-		    free (array[i]);
-	    free (array);
+	    g_strfreev (array);
 	}
 	break;
     case TypeColor:
@@ -404,7 +433,7 @@
 	    if (!array)
 		break;
 
-	    while (g_variant_iter_loop (iter, variantType, &colorValue))
+	    while (g_variant_iter_loop (&iter, "s", &colorValue))
     	    {
 		memset (&array[i], 0, sizeof (CCSSettingColorValue));
 		ccsStringToColor (colorValue,
@@ -419,7 +448,6 @@
     }
 
     free (cleanSettingName);
-    free (variantType);
 
     if (list)
     {
@@ -640,8 +668,7 @@
 		char       *pathName)
 {
     GSettings  		*settings = getSettingsObjectForCCSSetting (setting);
-    GVariant 		*value;
-    gchar		*variantType = NULL;
+    GVariant 		*value = NULL;
     CCSSettingValueList list;
 
     char *cleanSettingName = translateKeyForGSettings (ccsSettingGetName (setting));
@@ -653,7 +680,6 @@
     {
     case TypeBool:
 	{
-	    variantType = "ab";
 	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("ab"));
 	    while (list)
 	    {
@@ -666,7 +692,6 @@
 	break;
     case TypeInt:
 	{
-	    variantType = "ai";
 	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("ai"));
 	    while (list)
 	    {
@@ -679,7 +704,6 @@
 	break;
     case TypeFloat:
 	{
-	    variantType = "ad";
 	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("ad"));
 	    while (list)
 	    {
@@ -692,7 +716,6 @@
 	break;
     case TypeString:
 	{
-	    variantType = "as";
 	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
 	    while (list)
 	    {
@@ -705,7 +728,6 @@
 	break;
     case TypeMatch:
 	{
-	    variantType = "as";
 	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
 	    while (list)
 	    {
@@ -718,7 +740,6 @@
 	break;
     case TypeColor:
 	{
-	    variantType = "as";
 	    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
 	    char *item;
 	    while (list)
@@ -734,11 +755,10 @@
     default:
 	printf("GSettings backend: attempt to write unsupported list type %d!\n",
 	       ccsSettingGetInfo (setting)->forList.listType);
-	variantType = NULL;
 	break;
     }
 
-    if (variantType != NULL)
+    if (value)
     {
 	g_settings_set_value (settings, cleanSettingName, value);
 	g_variant_unref (value);
@@ -913,7 +933,7 @@
 }
 
 static void
-updateCurrentProfileName (char *profile)
+updateCurrentProfileName (const char *profile)
 {
     GVariant        *profiles;
     char	    *prof;
@@ -921,15 +941,15 @@
     char	    *currentProfilePath;
     GVariant        *newProfiles;
     GVariantBuilder *newProfilesBuilder;
-    GVariantIter    *iter;
+    GVariantIter    iter;
     gboolean        found = FALSE;
 
     profiles = g_settings_get_value (compizconfigSettings, "existing-profiles");
 
     newProfilesBuilder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
 
-    iter = g_variant_iter_new (profiles);
-    while (g_variant_iter_loop (iter, "s", &prof))
+    g_variant_iter_init (&iter, profiles);
+    while (g_variant_iter_loop (&iter, "s", &prof))
     {
 	g_variant_builder_add (newProfilesBuilder, "s", prof);
 
@@ -943,7 +963,6 @@
     newProfiles = g_variant_new ("as", newProfilesBuilder);
     g_settings_set_value (compizconfigSettings, "existing-profiles", newProfiles);
 
-    g_variant_iter_free (iter);
     g_variant_unref (newProfiles);
     g_variant_builder_unref (newProfilesBuilder);
 
@@ -964,8 +983,14 @@
 {
     char *profile = strdup (ccsGetProfile (context));
 
-    if (!profile || !strlen (profile))
-	profile = strdup (DEFAULTPROF);
+    if (!profile)
+	profile = strdup (DEFAULTPROF);
+
+    if (!strlen (profile))
+    {
+	free (profile);
+	profile = strdup (DEFAULTPROF);
+    }
 
     if (g_strcmp0 (profile, currentProfile))
 	updateCurrentProfileName (profile);
@@ -1157,15 +1182,15 @@
     GVariant        *newProfiles;
     GVariantBuilder *newProfilesBuilder;
     char            *plugin, *prof;
-    GVariantIter    *iter;
+    GVariantIter    iter;
     char            *profileSettingsPath = g_strconcat (PROFILEPATH, profile, "/", NULL);
     GSettings       *profileSettings = g_settings_new_with_path (PROFILE_SCHEMA_ID, profileSettingsPath);
 
     plugins = g_settings_get_value (currentProfileSettings, "plugins-with-set-keys");
     profiles = g_settings_get_value (compizconfigSettings, "existing-profiles");
 
-    iter = g_variant_iter_new (plugins);
-    while (g_variant_iter_loop (iter, "s", &plugin))
+    g_variant_iter_init (&iter, plugins);
+    while (g_variant_iter_loop (&iter, "s", &plugin))
     {
 	GSettings *settings;
 
@@ -1191,13 +1216,12 @@
     }
 
     /* Remove the profile from existing-profiles */
-    g_variant_iter_free (iter);
     g_settings_reset (profileSettings, "plugins-with-set-values");
 
-    iter = g_variant_iter_new (profiles);
+    g_variant_iter_init (&iter, profiles);
     newProfilesBuilder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
 
-    while (g_variant_iter_loop (iter, "s", &prof))
+    while (g_variant_iter_loop (&iter, "s", &prof))
     {
 	if (g_strcmp0 (prof, profile))
 	    g_variant_builder_add (newProfilesBuilder, "s", prof);