Merge lp:~compiz-team/compiz/compiz.fix_1050796 into lp:compiz/0.9.8

[Sam Spilsbury]

Remove some options from org.compiz.integrated and integrate them properly - adding special cases for options where upstream gnome forgot to change the key type.
(LP: #1050796)

Remove some options from org.compiz.integrated and integrate them properly - adding special cases for options where upstream gnome forgot to change the key type.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3389
http://jenkins.qa.ubuntu.com/job/compiz-ci/110/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/110/console

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3390
http://jenkins.qa.ubuntu.com/job/compiz-ci/114/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/114/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Looks and works fine to me.

A couple of potential issues in ccsCopyValue:
  1. This is not C: 872 + if (!value)
  2. Unreachable code: 918 + return NULL;

But when and if those become a problem, the compiler will tell you.

review: Approve

[Unity Merger (unity-merger)]

The prerequisite lp:~compiz-team/compiz/compiz.fix_1042041 has not yet been merged into lp:compiz.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3391
http://jenkins.qa.ubuntu.com/job/compiz-ci/119/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/119/console

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3391
http://jenkins.qa.ubuntu.com/job/compiz-ci/125/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/125/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

Blocked on lp:~sil2100/compiz/ubuntu_g-c-c_dep

[Daniel van Vugt (vanvugt)]

Still approved as per previous comments.

review: Approve

=== modified file 'compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting.h'
--- compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting.h	2012-08-17 07:33:02 +0000
+++ compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting.h	2012-09-25 15:17:24 +0000
@@ -26,6 +26,17 @@
 				  CCSGSettingsWrapper       *wrapper,
 				  CCSObjectAllocationInterface *ai);
 
+/**
+ * @brief ccsGSettingsIntegratedSettingsTranslateOldGNOMEKeyForGSettings
+ * @param key the old style gnome key to translate
+ * @return new-style key. Caller should free
+ *
+ * This translates old style keys (eg foo_bar) to new style keys
+ * foo-bar and special cases a few keys
+ */
+char *
+ccsGSettingsIntegratedSettingsTranslateOldGNOMEKeyForGSettings (const char *key);
+
 COMPIZCONFIG_END_DECLS
 
 #endif
 
=== modified file 'compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting_factory.h'
--- compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting_factory.h	2012-08-17 02:20:20 +0000
+++ compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting_factory.h	2012-09-25 15:17:24 +0000
@@ -39,6 +39,17 @@
 
 unsigned int ccsCCSGNOMEIntegrationGSettingsWrapperFactoryInterfaceGetType ();
 
+/**
+ * @brief ccsGSettingsIntegratedSettingsTranslateNewGNOMEKeyForCCS
+ * @param key the old style gnome key to translate
+ * @return new-style key. Caller should free
+ *
+ * This translates new style keys (eg foo-bar) to old style keys
+ * foo_bar and special cases a few keys
+ */
+char *
+ccsGSettingsIntegratedSettingsTranslateNewGNOMEKeyForCCS (const char *key);
+
 CCSGSettingsWrapper *
 ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (CCSGNOMEIntegrationGSettingsWrapperFactory *factory,
 							       const gchar				  *schemaName,
 
=== modified file 'compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml'
--- compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml	2012-09-05 23:26:55 +0000
+++ compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml	2012-09-25 15:17:24 +0000
@@ -4,18 +4,12 @@
 	<key type="b" name="display-all-workspaces">
 	    <default>true</default>
 	</key>
-	<key type="s" name="exec">
-	    <default>"gnome-terminal"</default>
-	</key>
 	<key type="s" name="command-window-screenshot">
 	    <default>"gnome-screenshot -w"</default>
 	</key>
 	<key type="s" name="command-screenshot">
 	    <default>"gnome-screenshot"</default>
 	</key>
-	<key type="s" name="command-terminal">
-	    <default>"gnome-terminal"</default>
-	</key>
 	<key type="as" name="run-command-12">
 	    <default>["Disabled"]</default>
 	</key>
@@ -88,21 +82,6 @@
 	<key type="s" name="command-1">
 	    <default>""</default>
 	</key>
-	<key type="as" name="run-command-terminal">
-	    <default>["&lt;Control&gt;&lt;Alt&gt;t"]</default>
-	</key>
-	<key type="as" name="run-command-window-screenshot">
-	    <default>["&lt;Alt&gt;Print"]</default>
-	</key>
-	<key type="as" name="run-command-screenshot">
-	    <default>["Print"]</default>
-	</key>
-	<key type="as" name="panel-main-menu">
-	    <default>["&lt;Alt&gt;F1"]</default>
-	</key>
-	<key type="as" name="panel-run-dialog">
-	    <default>["&lt;Alt&gt;F2"]</default>
-	</key>
 	<key type="as" name="show-hud">
 	    <default>["&lt;Alt&gt;"]</default>
 	</key>
 
=== modified file 'compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c'
--- compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c	2012-09-24 10:44:29 +0000
+++ compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c	2012-09-25 15:17:24 +0000
@@ -24,6 +24,30 @@
     CCSGSettingsWrapper	      *wrapper;
 };
 
+char *
+ccsGSettingsIntegratedSettingsTranslateOldGNOMEKeyForGSettings (const char *key)
+{
+    char *newKey = translateKeyForGSettings (key);
+
+    if (g_strcmp0 (newKey, "run-command-screenshot") == 0)
+    {
+	free (newKey);
+	newKey = strdup ("screenshot");
+    }
+    else if (g_strcmp0 (newKey, "run-command-window-screenshot") == 0)
+    {
+	free (newKey);
+	newKey = strdup ("window-screenshot");
+    }
+    else if (g_strcmp0 (newKey, "run-command-terminal") == 0)
+    {
+	free (newKey);
+	newKey = strdup ("terminal");
+    }
+
+    return newKey;
+}
+
 SpecialOptionType
 ccsGSettingsIntegratedSettingGetSpecialOptionType (CCSGNOMEIntegratedSettingInfo *setting)
 {
@@ -46,7 +70,7 @@
     CCSGSettingsIntegratedSettingPrivate *priv = (CCSGSettingsIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
     CCSSettingValue		     *v = calloc (1, sizeof (CCSSettingValue));
     const char			     *gnomeKeyName = ccsGNOMEIntegratedSettingInfoGetGNOMEName ((CCSGNOMEIntegratedSettingInfo *) setting);
-    char			     *gsettingsTranslatedName = translateKeyForGSettings (gnomeKeyName);
+    char			     *gsettingsTranslatedName = ccsGSettingsIntegratedSettingsTranslateOldGNOMEKeyForGSettings (gnomeKeyName);
 
     v->isListChild = FALSE;
     v->parent = NULL;
@@ -137,7 +161,7 @@
 {
     CCSGSettingsIntegratedSettingPrivate *priv = (CCSGSettingsIntegratedSettingPrivate *) ccsObjectGetPrivate (setting);
     const char			     *gnomeKeyName = ccsGNOMEIntegratedSettingInfoGetGNOMEName ((CCSGNOMEIntegratedSettingInfo *) setting);
-    char			     *gsettingsTranslatedName = translateKeyForGSettings (gnomeKeyName);
+    char			     *gsettingsTranslatedName = ccsGSettingsIntegratedSettingsTranslateOldGNOMEKeyForGSettings (gnomeKeyName);
 
     GVariant           *variant = ccsGSettingsWrapperGetValue (priv->wrapper, gsettingsTranslatedName);
     const GVariantType *variantType = g_variant_get_type (variant);
 
=== modified file 'compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting_factory.c'
--- compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting_factory.c	2012-08-17 07:33:02 +0000
+++ compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting_factory.c	2012-09-25 15:17:24 +0000
@@ -21,6 +21,30 @@
 
 INTERFACE_TYPE (CCSGNOMEIntegrationGSettingsWrapperFactoryInterface);
 
+char *
+ccsGSettingsIntegratedSettingsTranslateNewGNOMEKeyForCCS (const char *key)
+{
+    char *newKey = translateKeyForCCS (key);
+
+    if (g_strcmp0 (newKey, "screenshot") == 0)
+    {
+	free (newKey);
+	newKey = strdup ("run_command_screenshot");
+    }
+    else if (g_strcmp0 (newKey, "window_screenshot") == 0)
+    {
+	free (newKey);
+	newKey = strdup ("run_command_window_screenshot");
+    }
+    else if (g_strcmp0 (newKey, "terminal") == 0)
+    {
+	free (newKey);
+	newKey = strdup ("run_command_terminal");
+    }
+
+    return newKey;
+}
+
 CCSGSettingsWrapper *
 ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (CCSGNOMEIntegrationGSettingsWrapperFactory *factory,
 							       const gchar				  *schemaName,
@@ -103,7 +127,7 @@
 			    gpointer  user_data)
 {
     CCSGNOMEValueChangeData *data = (CCSGNOMEValueChangeData *) user_data;
-    char *baseName = translateKeyForCCS (key);
+    char *baseName = ccsGSettingsIntegratedSettingsTranslateNewGNOMEKeyForCCS (key);
 
     /* We don't care if integration is not enabled */
     if (!ccsGetIntegrationEnabled (data->context))
@@ -185,6 +209,18 @@
 											gnomeGSettingsValueChanged,
 											data,
 											factory->object.object_allocation));
+    g_hash_table_insert (quarksToGSettingsWrappers, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL),
+			 ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (factory,
+											g_quark_to_string (quarks->ORG_GNOME_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL),
+											gnomeGSettingsValueChanged,
+											data,
+											factory->object.object_allocation));
+    g_hash_table_insert (quarksToGSettingsWrappers, GINT_TO_POINTER (quarks->ORG_GNOME_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS),
+			 ccsGNOMEIntegrationGSettingsWrapperFactoryNewGSettingsWrapper (factory,
+											g_quark_to_string (quarks->ORG_GNOME_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS),
+											gnomeGSettingsValueChanged,
+											data,
+											factory->object.object_allocation));
 
     return quarksToGSettingsWrappers;
 }
 
=== modified file 'compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h'
--- compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h	2012-09-23 16:46:19 +0000
+++ compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h	2012-09-25 15:17:24 +0000
@@ -188,6 +188,8 @@
 {
     GQuark ORG_GNOME_DESKTOP_WM_PREFERENCES;
     GQuark ORG_GNOME_DESKTOP_WM_KEYBINDINGS;
+    GQuark ORG_GNOME_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS;
+    GQuark ORG_GNOME_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL;
     GQuark ORG_COMPIZ_INTEGRATED;
 } CCSGSettingsWrapperIntegratedSchemasQuarks;
 
 
=== modified file 'compizconfig/integration/gnome/src/ccs_gnome_integration.c'
--- compizconfig/integration/gnome/src/ccs_gnome_integration.c	2012-09-24 03:55:38 +0000
+++ compizconfig/integration/gnome/src/ccs_gnome_integration.c	2012-09-25 15:17:24 +0000
@@ -160,6 +160,29 @@
 }
 
 static Bool
+ccsGNOMEIntegrationBackendReadISAndSetSettingForType (CCSIntegratedSetting *integratedSetting,
+						      CCSSetting           *setting,
+						      CCSSettingValue      **v,
+						      CCSSettingType       type)
+{
+    *v = ccsIntegratedSettingReadValue (integratedSetting, type);
+
+    if ((*v)->value.asString)
+    {
+	CCSSettingKeyValue key;
+
+	memset (&key, 0, sizeof (CCSSettingKeyValue));
+	if (ccsStringToKeyBinding ((*v)->value.asString, &key))
+	{
+	    ccsSetKey (setting, key, TRUE);
+	    return TRUE;
+	}
+    }
+
+    return FALSE;
+}
+
+static Bool
 ccsGNOMEIntegrationBackendReadOptionIntoSetting (CCSIntegration *integration,
 						 CCSContext	       *context,
 						 CCSSetting	       *setting,
@@ -209,20 +232,11 @@
     case OptionKey:
 	{
 	    type = TypeKey;
-	    v = ccsIntegratedSettingReadValue (integratedSetting, type);
-
-	    if (v->value.asString)
-	    {
-		CCSSettingKeyValue key;
-
-		memset (&key, 0, sizeof (CCSSettingKeyValue));
-		ccsGetKey (setting, &key);
-		if (ccsStringToKeyBinding (v->value.asString, &key))
-		{
-		    ccsSetKey (setting, key, TRUE);
-		    ret = TRUE;
-		}
-	    }
+	    if (ccsGNOMEIntegrationBackendReadISAndSetSettingForType (integratedSetting,
+								      setting,
+								      &v,
+								      type))
+		ret = TRUE;
 	}
 	break;
     case OptionSpecial:
@@ -268,6 +282,17 @@
 		    ret = TRUE;
 		}
 	    }
+	    else if ((strcmp (settingName, "run_command_screenshot_key") == 0 ||
+		      strcmp (settingName, "run_command_window_screenshot_key") == 0 ||
+		      strcmp (settingName, "run_command_terminal_key") == 0))
+	    {
+		type = TypeString;
+		if (ccsGNOMEIntegrationBackendReadISAndSetSettingForType (integratedSetting,
+									  setting,
+									  &v,
+									  type))
+		    ret = TRUE;
+	    }
 	    else if (((strcmp (settingName, "initiate_button") == 0) &&
 		      ((strcmp (pluginName, "move") == 0) ||
 		       (strcmp (pluginName, "resize") == 0))) ||
@@ -373,6 +398,29 @@
     }
 }
 
+static Bool
+ccsGNOMEIntegrationBackendKeyValueToStringValue (CCSSettingValue *keyValue,
+						 CCSSettingValue *stringValue)
+{
+    char  *newValue;
+
+    newValue = ccsKeyBindingToString (&keyValue->value.asKey);
+    if (newValue)
+    {
+	if (strcmp (newValue, "Disabled") == 0)
+	{
+	    /* Metacity doesn't like "Disabled", it wants "disabled" */
+	    newValue[0] = 'd';
+	}
+
+	stringValue->value.asString = newValue;
+
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
 static void
 ccsGNOMEIntegrationBackendWriteOptionFromSetting (CCSIntegration *integration,
 						  CCSContext		 *context,
@@ -393,7 +441,14 @@
     /* Do not allow recursing back into writeIntegratedSetting */
     ccsIntegrationDisallowIntegratedWrites (integration);
 
-    CCSSettingValue *v = ccsSettingGetValue (setting);
+    CCSSettingType sType = ccsSettingGetType (setting);
+    CCSSettingInfo *sInfo = ccsSettingGetInfo (setting);
+
+    CCSSettingValue *vSetting = ccsSettingGetValue (setting);
+    CCSSettingValue *v = ccsCopyValue (vSetting, sType, sInfo);
+
+    if (!v)
+	return;
 
     switch (ccsGNOMEIntegratedSettingInfoGetSpecialOptionType ((CCSGNOMEIntegratedSettingInfo *) integratedSetting))
     {
@@ -408,25 +463,22 @@
 	break;
     case OptionKey:
 	{   
-	    char  *newValue;
-
-	    newValue = ccsKeyBindingToString (&(ccsSettingGetValue (setting)->value.asKey));
-	    if (newValue)
-    	    {
-		if (strcmp (newValue, "Disabled") == 0)
-		{
-		    /* Metacity doesn't like "Disabled", it wants "disabled" */
-		    newValue[0] = 'd';
-		}
-
+	    CCSSettingValue *newValue = calloc (1, sizeof (CCSSettingValue));
+
+	    newValue->isListChild = FALSE;
+	    newValue->parent = NULL;
+	    newValue->refCount = 1;
+
+	    if (ccsGNOMEIntegrationBackendKeyValueToStringValue (v, newValue))
+	    {
 		/* Really this is a lie - the writer expects a string
 		 * but it needs to know if its a key or a string */
 		type = TypeKey;
-		v->value.asString = newValue;
-
-		ccsIntegratedSettingWriteValue (integratedSetting, v, type);
-		free (newValue);
+		ccsIntegratedSettingWriteValue (integratedSetting, newValue, type);
 	    }
+
+	    if (newValue)
+		ccsFreeSettingValueWithType (newValue, TypeString);
 	}
 	break;
     case OptionSpecial:
@@ -462,6 +514,18 @@
 
 		ccsIntegratedSettingWriteValue (integratedSetting, newValue, type);
 	    }
+	    else if ((strcmp (settingName, "run_command_screenshot_key") == 0 ||
+		      strcmp (settingName, "run_command_window_screenshot_key") == 0 ||
+		      strcmp (settingName, "run_command_terminal_key") == 0))
+	    {
+		if (ccsGNOMEIntegrationBackendKeyValueToStringValue (v, newValue))
+		{
+		    /* These are actually stored as strings in the schemas */
+		    type = TypeString;
+		    ccsIntegratedSettingWriteValue (integratedSetting, newValue, type);
+		}
+
+	    }
 	    else if (((strcmp (settingName, "initiate_button") == 0) &&
 		      ((strcmp (pluginName, "move") == 0) ||
 		       (strcmp (pluginName, "resize") == 0))) ||
@@ -520,6 +584,9 @@
 	g_error_free (err);
     }
 
+    if (v)
+	ccsFreeSettingValueWithType (v, sType);
+
     /* we should immediately write changed settings */
     ccsWriteChangedSettings (priv->context);
     ccsIntegrationAllowIntegratedWrites (integration);
 
=== modified file 'compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c'
--- compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c	2012-08-22 09:15:24 +0000
+++ compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c	2012-09-25 15:17:24 +0000
@@ -431,10 +431,14 @@
     static const char *org_compiz_integrated = "org.compiz.integrated";
     static const char *org_gnome_desktop_wm_keybindings = "org.gnome.desktop.wm.keybindings";
     static const char *org_gnome_desktop_wm_preferences = "org.gnome.desktop.wm.preferences";
+    static const char *org_gnome_settings_daemon_plugins_media_keys = "org.gnome.settings-daemon.plugins.media-keys";
+    static const char *org_gnome_desktop_default_applications_terminal = "org.gnome.desktop.default-applications.terminal";
 
     quarks->ORG_COMPIZ_INTEGRATED = g_quark_from_string (org_compiz_integrated);
     quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS = g_quark_from_string (org_gnome_desktop_wm_keybindings);
     quarks->ORG_GNOME_DESKTOP_WM_PREFERENCES = g_quark_from_string (org_gnome_desktop_wm_preferences);
+    quarks->ORG_GNOME_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS = g_quark_from_string (org_gnome_settings_daemon_plugins_media_keys);
+    quarks->ORG_GNOME_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL = g_quark_from_string (org_gnome_desktop_default_applications_terminal);
 
     return NULL;
 }
@@ -501,7 +505,7 @@
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUTORAISE_DELAY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_PREFERENCES));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_AUTORAISE.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_PREFERENCES));
     g_hash_table_insert (thumbnailHashTable, (gpointer) names->THUMBNAIL_CURRENT_VIEWPORT.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_COMMAND_TERMINAL.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
+    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_COMMAND_TERMINAL.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_DEFAULT_APPLICATIONS_TERMINAL));
     g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_COMMAND_WINDOW_SCREENSHOT.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
     g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_COMMAND_SCREENSHOT.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
     g_hash_table_insert (rotateHashTable, (gpointer) names->ROTATE_ROTATE_RIGHT_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
@@ -609,11 +613,11 @@
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
-    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_TERMINAL_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_WINDOW_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_MAIN_MENU_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
-    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_KEY.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
+    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_TERMINAL_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS));
+    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_WINDOW_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS));
+    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_SETTINGS_DAEMON_PLUGINS_MEDIA_KEYS));
+    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_MAIN_MENU_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
+    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_KEY.compizName, GINT_TO_POINTER (quarks->ORG_GNOME_DESKTOP_WM_KEYBINDINGS));
     g_hash_table_insert (unityshellHashTable, (gpointer) names->UNITYSHELL_SHOW_HUD.compizName, GINT_TO_POINTER (quarks->ORG_COMPIZ_INTEGRATED));
 
     return masterHashTable;
@@ -937,9 +941,9 @@
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MAXIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_MINIMIZE_WINDOW_KEY.compizName, GINT_TO_POINTER (OptionKey));
     g_hash_table_insert (coreHashTable, (gpointer) names->CORE_TOGGLE_WINDOW_MAXIMIZED_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_TERMINAL_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_WINDOW_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (OptionKey));
-    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (OptionKey));
+    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_TERMINAL_KEY.compizName, GINT_TO_POINTER (OptionSpecial));
+    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_WINDOW_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (OptionSpecial));
+    g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_COMMAND_SCREENSHOT_KEY.compizName, GINT_TO_POINTER (OptionSpecial));
     g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_MAIN_MENU_KEY.compizName, GINT_TO_POINTER (OptionKey));
     g_hash_table_insert (gnomecompatHashTable, (gpointer) names->GNOMECOMPAT_RUN_KEY.compizName, GINT_TO_POINTER (OptionKey));
     g_hash_table_insert (unityshellHashTable, (gpointer) names->UNITYSHELL_SHOW_HUD.compizName, GINT_TO_POINTER (OptionKey));
 
=== modified file 'compizconfig/integration/gnome/tests/compizconfig_ccs_mock_gnome_integrated_setting_composition.c'
--- compizconfig/integration/gnome/tests/compizconfig_ccs_mock_gnome_integrated_setting_composition.c	2012-09-23 16:46:19 +0000
+++ compizconfig/integration/gnome/tests/compizconfig_ccs_mock_gnome_integrated_setting_composition.c	2012-09-25 15:17:24 +0000
@@ -131,7 +131,6 @@
 
     ccsIntegratedSettingUnref (priv->integratedSetting);
     ccsGNOMEIntegratedSettingInfoUnref (priv->gnomeIntegratedSettingInfo);
-    ccsIntegratedSettingInfoUnref (priv->integratedSettingInfo);
 
     ccsObjectFinalize (integratedSetting);
     (*integratedSetting->object.object_allocation->free_)
@@ -202,7 +201,6 @@
 
     ccsIntegratedSettingRef (priv->integratedSetting);
     ccsGNOMEIntegratedSettingInfoRef (priv->gnomeIntegratedSettingInfo);
-    ccsIntegratedSettingInfoRef (priv->integratedSettingInfo);
 
     ccsObjectSetPrivate (composition, (CCSPrivate *) (priv));
     ccsObjectAddInterface (composition,
 
=== modified file 'compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp'
--- compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp	2012-09-24 03:44:08 +0000
+++ compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp	2012-09-25 15:17:24 +0000
@@ -58,6 +58,8 @@
 using ::testing::ReturnNull;
 using ::testing::SetArgPointee;
 using ::testing::DoAll;
+using ::testing::Values;
+using ::testing::WithParamInterface;
 using ::testing::_;
 
 namespace
@@ -80,6 +82,7 @@
 						   setting.c_str (),
 						   type,
 						   allocator);
+	/* This takes ownership of integratedSettingInfo */
 	CCSGNOMEIntegratedSettingInfo *gnomeIntegratedSettingInfo =
 		ccsGNOMEIntegratedSettingInfoNew (integratedSettingInfo,
 						  gnomeType,
@@ -100,7 +103,6 @@
 
 	/* We want the composition to take ownership here, so unref the
 	 * original members of the composition */
-	ccsIntegratedSettingInfoUnref (integratedSettingInfo);
 	ccsGNOMEIntegratedSettingInfoUnref (gnomeIntegratedSettingInfo);
 	ccsIntegratedSettingUnref (integratedSetting);
 
@@ -119,38 +121,37 @@
 	return std::tr1::get <1> (integratedSettingWithMocks).get ();
     }
 
-    typedef std::tr1::tuple <CCSContextGMock                                  &,
-			     CCSBackendGMock                                  &,
-			     CCSIntegratedSettingsStorageGMock                &,
-			     CCSIntegratedSettingFactoryGMock                 &,
-			     boost::shared_ptr <CCSContext>                    ,
-			     boost::shared_ptr <CCSBackend>                    ,
-			     boost::shared_ptr <CCSIntegratedSettingsStorage>  ,
-			     boost::shared_ptr <CCSIntegratedSettingFactory>   ,
-			     boost::shared_ptr <CCSIntegration>                 > CCSGNOMEIntegrationWithMocks;
+    typedef std::tr1::tuple <CCSContextGMock                   &,
+			     CCSBackendGMock                   &,
+			     CCSIntegratedSettingsStorageGMock &,
+			     CCSIntegratedSettingFactoryGMock  &,
+			     boost::shared_ptr <CCSContext>     ,
+			     boost::shared_ptr <CCSBackend>     ,
+			     CCSIntegratedSettingsStorage      *,
+			     CCSIntegratedSettingFactory       *,
+			     boost::shared_ptr <CCSIntegration> > CCSGNOMEIntegrationWithMocks;
 
     CCSGNOMEIntegrationWithMocks
     createIntegrationWithMocks (CCSObjectAllocationInterface *ai)
     {
-	boost::shared_ptr <CCSContext>                   context (AutoDestroy (ccsMockContextNew (),
-									       ccsFreeContext));
-	boost::shared_ptr <CCSBackend>                   backend (AutoDestroy (ccsMockBackendNew (),
-									       ccsBackendUnref));
-	boost::shared_ptr <CCSIntegratedSettingsStorage> storage (AutoDestroy (ccsMockIntegratedSettingsStorageNew (ai),
-									       ccsIntegratedSettingsStorageUnref));
-	boost::shared_ptr <CCSIntegratedSettingFactory>  factory (AutoDestroy (ccsMockIntegratedSettingFactoryNew (ai),
-									       ccsIntegratedSettingFactoryUnref));
-	boost::shared_ptr <CCSIntegration>               integration (AutoDestroy (ccsGNOMEIntegrationBackendNew (backend.get (),
-														  context.get (),
-														  factory.get (),
-														  storage.get (),
-														  ai),
-										   ccsIntegrationUnref));
+	boost::shared_ptr <CCSContext>     context (AutoDestroy (ccsMockContextNew (),
+								 ccsFreeContext));
+	boost::shared_ptr <CCSBackend>     backend (AutoDestroy (ccsMockBackendNew (),
+								 ccsFreeMockBackend));
+	/* The GNOME Integration backend takes ownership of these two */
+	CCSIntegratedSettingsStorage       *storage (ccsMockIntegratedSettingsStorageNew (ai));
+	CCSIntegratedSettingFactory        *factory (ccsMockIntegratedSettingFactoryNew (ai));
+	boost::shared_ptr <CCSIntegration> integration (AutoDestroy (ccsGNOMEIntegrationBackendNew (backend.get (),
+												    context.get (),
+												    factory,
+												    storage,
+												    ai),
+							ccsIntegrationUnref));
 
 	CCSContextGMock                   &gmockContext = *(reinterpret_cast <CCSContextGMock *> (ccsObjectGetPrivate (context.get ())));
 	CCSBackendGMock                   &gmockBackend = *(reinterpret_cast <CCSBackendGMock *> (ccsObjectGetPrivate (backend.get ())));
-	CCSIntegratedSettingsStorageGMock &gmockStorage = *(reinterpret_cast <CCSIntegratedSettingsStorageGMock *> (ccsObjectGetPrivate (storage.get ())));
-	CCSIntegratedSettingFactoryGMock  &gmockFactory = *(reinterpret_cast <CCSIntegratedSettingFactoryGMock *> (ccsObjectGetPrivate (factory.get ())));
+	CCSIntegratedSettingsStorageGMock &gmockStorage = *(reinterpret_cast <CCSIntegratedSettingsStorageGMock *> (ccsObjectGetPrivate (storage)));
+	CCSIntegratedSettingFactoryGMock  &gmockFactory = *(reinterpret_cast <CCSIntegratedSettingFactoryGMock *> (ccsObjectGetPrivate (factory)));
 
 	return CCSGNOMEIntegrationWithMocks (gmockContext,
 					     gmockBackend,
@@ -222,10 +223,19 @@
 	EXPECT_CALL (plugin, getName ()).WillOnce (Return (pluginName.c_str ()));
     }
 
+    void
+    SetTypeInfo (CCSSettingGMock &setting,
+		 CCSSettingType  type,
+		 CCSSettingInfo  *info)
+    {
+	EXPECT_CALL (setting, getType ()).WillOnce (Return (type));
+	EXPECT_CALL (setting, getInfo ()).WillOnce (Return (info));
+    }
+
     CCSSettingValue *
     MakeSettingValue ()
     {
-	CCSSettingValue *v = new CCSSettingValue;
+	CCSSettingValue *v = reinterpret_cast <CCSSettingValue *> (calloc (1, sizeof (CCSSettingValue)));
 	v->parent = NULL;
 	v->isListChild = FALSE;
 	v->refCount = 1;
@@ -236,7 +246,7 @@
     boost::shared_ptr <CCSSettingValue>
     MakeAutoDestroySettingValue (CCSSettingType type)
     {
-	CCSSettingValue *v = new CCSSettingValue;
+	CCSSettingValue *v = reinterpret_cast <CCSSettingValue *> (calloc (1, sizeof (CCSSettingValue)));
 	v->parent = NULL;
 	v->isListChild = FALSE;
 	v->refCount = 1;
@@ -387,6 +397,82 @@
 
 namespace
 {
+    struct IntegratedMediaKeysParam
+    {
+	public:
+
+	    IntegratedMediaKeysParam (const std::string &settingName,
+				      const std::string &integratedName,
+				      const std::string &keyValueString) :
+		settingName (settingName),
+		integratedName (integratedName),
+		keyValueString (keyValueString)
+	    {
+		EXPECT_TRUE (ccsStringToKeyBinding (keyValueString.c_str (),
+						    &keyValue));
+	    }
+
+	    const std::string  settingName;
+	    const std::string  integratedName;
+	    const std::string  keyValueString;
+	    CCSSettingKeyValue keyValue;
+    };
+}
+
+namespace
+{
+    std::string RUN_COMMAND_SCREENSHOT_KEY ("run_command_screenshot_key");
+    std::string SCREENSHOT ("screenshot");
+    std::string SCREENSHOT_BINDING ("<Alt>Print");
+    std::string RUN_COMMAND_WINDOW_SCREENSHOT_KEY ("run_command_window_screenshot_key");
+    std::string WINDOW_SCREENSHOT ("window_screenshot");
+    std::string WINDOW_SCREENSHOT_BINDING ("<Control><Alt>Print");
+    std::string RUN_COMMAND_TERMINAL_KEY ("run_command_terminal_key");
+    std::string TERMINAL ("terminal");
+    std::string TERMINAL_BINDING ("<Control><Alt>t");
+}
+
+class CCSGNOMEIntegrationTestReadIntegratedMediaKeys :
+    public CCSGNOMEIntegrationTestReadIntegrated,
+    public WithParamInterface <IntegratedMediaKeysParam>
+{
+};
+
+TEST_P (CCSGNOMEIntegrationTestReadIntegratedMediaKeys, TestReadIntegratedMediaKey)
+{
+    const std::string settingName (GetParam ().settingName);
+    CCSSettingValue   *v = MakeSettingValue ();
+    v->value.asString = strdup (GetParam ().keyValueString.c_str ());
+
+    mIntegratedSetting = createIntegratedSettingCompositionFromMock (MOCK_PLUGIN,
+								     settingName,
+								     TypeString,
+								     OptionSpecial,
+								     MOCK_GNOME_NAME,
+								     &ccsDefaultObjectAllocator);
+    SetNames (mSettingMock, mPluginMock, settingName, MOCK_PLUGIN);
+    EXPECT_CALL (Mock (*mIntegratedSetting), readValue (TypeString)).WillOnce (Return (v));
+    EXPECT_CALL (mSettingMock, setKey (Eq (GetParam ().keyValue), IsTrue ()));
+
+    EXPECT_THAT (ccsIntegrationReadOptionIntoSetting (Real (mIntegration),
+						      NULL,
+						      mSetting.get (),
+						      Real (*mIntegratedSetting)), IsTrue ());
+}
+
+INSTANTIATE_TEST_CASE_P (CCSGNOMEMediaKeys, CCSGNOMEIntegrationTestReadIntegratedMediaKeys,
+			 Values (IntegratedMediaKeysParam (RUN_COMMAND_SCREENSHOT_KEY,
+							   SCREENSHOT,
+							   SCREENSHOT_BINDING),
+				 IntegratedMediaKeysParam (RUN_COMMAND_WINDOW_SCREENSHOT_KEY,
+							   WINDOW_SCREENSHOT,
+							   WINDOW_SCREENSHOT_BINDING),
+				 IntegratedMediaKeysParam (RUN_COMMAND_TERMINAL_KEY,
+							   TERMINAL,
+							   TERMINAL_BINDING)));
+
+namespace
+{
     const std::string DEFAULT_MOUSE_BUTTON_MODIFIERS_STRING ("<Alt>");
     const std::string GNOME_MOUSE_BUTTON_MODIFIERS_STRING ("<Super>");
     const unsigned int DEFAULT_MOUSE_BUTTON_MODIFIERS =
@@ -622,7 +708,8 @@
     newButtonValue.buttonModMask = 0;
 
     /* Clear the old expectation */
-    ccsIntegratedSettingReadValue (mIntegratedSettingMBM.get (), TypeString);
+    ccsFreeSettingValueWithType (ccsIntegratedSettingReadValue (mIntegratedSettingMBM.get (), TypeString),
+				 TypeString);
     /* Now return null */
     EXPECT_CALL (mIntegratedSettingMBMMock, readValue (TypeString)).WillOnce (ReturnNull ());
 
@@ -661,6 +748,7 @@
 								     MOCK_GNOME_NAME,
 								     &ccsDefaultObjectAllocator);
     SetNames (mSettingMock, mPluginMock, settingName, MOCK_PLUGIN);
+    SetTypeInfo (mSettingMock, TypeBool, &info);
 
     EXPECT_CALL (mSettingMock, getValue ()).WillOnce (Return (compizValue.get ()));
     EXPECT_CALL (Mock (*mIntegratedSetting), writeValue (Pointee (SettingValueMatch (*gnomeValue,
@@ -690,6 +778,7 @@
 								     MOCK_GNOME_NAME,
 								     &ccsDefaultObjectAllocator);
     SetNames (mSettingMock, mPluginMock, settingName, MOCK_PLUGIN);
+    SetTypeInfo (mSettingMock, TypeBool, &info);
 
     EXPECT_CALL (mSettingMock, getValue ()).WillOnce (Return (compizValue.get ()));
     EXPECT_CALL (Mock (*mIntegratedSetting), writeValue (Pointee (SettingValueMatch (*gnomeValue,
@@ -719,25 +808,81 @@
 								     MOCK_GNOME_NAME,
 								     &ccsDefaultObjectAllocator);
     SetNames (mSettingMock, mPluginMock, settingName, MOCK_PLUGIN);
-
-    EXPECT_CALL (mSettingMock, getValue ()).WillOnce (Return (compizValue.get ()));
-    EXPECT_CALL (Mock (*mIntegratedSetting), writeValue (Pointee (SettingValueMatch (*gnomeValue,
-										     TypeString,
-										     &info)),
-							 TypeString));
-    ccsIntegrationWriteSettingIntoOption (Real (mIntegration),
-					  NULL,
-					  mSetting.get (),
-					  Real (*mIntegratedSetting));
-}
+    SetTypeInfo (mSettingMock, TypeBool, &info);
+
+    EXPECT_CALL (mSettingMock, getValue ()).WillOnce (Return (compizValue.get ()));
+    EXPECT_CALL (Mock (*mIntegratedSetting), writeValue (Pointee (SettingValueMatch (*gnomeValue,
+										     TypeString,
+										     &info)),
+							 TypeString));
+    ccsIntegrationWriteSettingIntoOption (Real (mIntegration),
+					  NULL,
+					  mSetting.get (),
+					  Real (*mIntegratedSetting));
+}
+
+class CCSGNOMEIntegrationTestWriteIntegratedMediaKeys :
+    public CCSGNOMEIntegrationTestWriteIntegrated,
+    public WithParamInterface <IntegratedMediaKeysParam>
+{
+};
+
+TEST_P (CCSGNOMEIntegrationTestWriteIntegratedMediaKeys, TestWriteIntegratedMediaKey)
+{
+    const std::string                   settingName (GetParam ().settingName);
+    boost::shared_ptr <CCSSettingValue> compizValue (MakeAutoDestroySettingValue (TypeKey));
+    boost::shared_ptr <CCSSettingValue> gnomeValue (MakeAutoDestroySettingValue (TypeString));
+    CCSSettingInfo                      info;
+
+    compizValue->value.asKey = GetParam ().keyValue;
+    gnomeValue->value.asString = strdup (GetParam ().keyValueString.c_str ());
+
+    mIntegratedSetting = createIntegratedSettingCompositionFromMock (MOCK_PLUGIN,
+								     settingName,
+								     TypeString,
+								     OptionSpecial,
+								     MOCK_GNOME_NAME,
+								     &ccsDefaultObjectAllocator);
+    SetNames (mSettingMock, mPluginMock, settingName, MOCK_PLUGIN);
+    SetTypeInfo (mSettingMock, TypeKey, &info);
+
+    EXPECT_CALL (mSettingMock, getValue ()).WillOnce (Return (compizValue.get ()));
+    EXPECT_CALL (Mock (*mIntegratedSetting), writeValue (Pointee (SettingValueMatch (*gnomeValue,
+										     TypeString,
+										     &info)),
+							 TypeString));
+    ccsIntegrationWriteSettingIntoOption (Real (mIntegration),
+					  NULL,
+					  mSetting.get (),
+					  Real (*mIntegratedSetting));
+}
+
+INSTANTIATE_TEST_CASE_P (CCSGNOMEMediaKeys, CCSGNOMEIntegrationTestWriteIntegratedMediaKeys,
+			 Values (IntegratedMediaKeysParam (RUN_COMMAND_SCREENSHOT_KEY,
+							   SCREENSHOT,
+							   SCREENSHOT_BINDING),
+				 IntegratedMediaKeysParam (RUN_COMMAND_WINDOW_SCREENSHOT_KEY,
+							   WINDOW_SCREENSHOT,
+							   WINDOW_SCREENSHOT_BINDING),
+				 IntegratedMediaKeysParam (RUN_COMMAND_TERMINAL_KEY,
+							   TERMINAL,
+							   TERMINAL_BINDING)));
 
 /*
  * TODO: Break up the function that this test covers. Its way too complicated
  */
 TEST_F (CCSGNOMEIntegrationTestWithMocksWriteIntegratedMouseButtonModifiers, TestWriteMouseButtonModifier)
 {
-    const std::string settingName ("initiate_button");
-    const std::string pluginName  ("move");
+    const std::string moveSettingName ("initiate_button");
+    const std::string movePluginName ("move");
+    const std::string resizeSettingName ("initiate_button");
+    const std::string resizePluginName ("resize");
+    const std::string coreSettingName ("window_menu_button");
+    const std::string corePluginName ("core");
+
+    const std::string settingName (moveSettingName);
+    const std::string pluginName  (movePluginName);
+
     CCSSettingInfo info;
 
     mIntegratedSetting = createIntegratedSettingCompositionFromMock (pluginName,
@@ -747,19 +892,20 @@
 								     MOCK_GNOME_NAME,
 								     &ccsDefaultObjectAllocator);
     SetNames (mSettingMock, mPluginMock, settingName, pluginName);
+    SetTypeInfo (mSettingMock, TypeButton, &info);
 
-    EXPECT_CALL (MockContext (mIntegration), findPlugin (Eq ("move"))).WillRepeatedly (Return (movePlugin.get ()));
-    EXPECT_CALL (movePluginMock, findSetting (Eq ("initiate_button"))).WillRepeatedly (Return (moveInitiateButtonSetting.get ()));
+    EXPECT_CALL (MockContext (mIntegration), findPlugin (Eq (movePluginName))).WillRepeatedly (Return (movePlugin.get ()));
+    EXPECT_CALL (movePluginMock, findSetting (Eq (moveSettingName))).WillRepeatedly (Return (moveInitiateButtonSetting.get ()));
     EXPECT_CALL (moveInitiateButtonSettingMock, getType ()).WillRepeatedly (Return (TypeButton));
     EXPECT_CALL (moveInitiateButtonSettingMock, getValue ()).WillRepeatedly (Return (moveInitiateButton.get ()));
 
-    EXPECT_CALL (MockContext (mIntegration), findPlugin (Eq ("resize"))).WillRepeatedly (Return (resizePlugin.get ()));
-    EXPECT_CALL (resizePluginMock, findSetting (Eq ("initiate_button"))).WillRepeatedly (Return (resizeInitiateButtonSetting.get ()));
+    EXPECT_CALL (MockContext (mIntegration), findPlugin (Eq (resizePluginName))).WillRepeatedly (Return (resizePlugin.get ()));
+    EXPECT_CALL (resizePluginMock, findSetting (Eq (resizeSettingName))).WillRepeatedly (Return (resizeInitiateButtonSetting.get ()));
     EXPECT_CALL (resizeInitiateButtonSettingMock, getType ()).WillRepeatedly (Return (TypeButton));
     EXPECT_CALL (resizeInitiateButtonSettingMock, getValue ()).WillRepeatedly (Return (resizeInitiateButton.get ()));
 
-    EXPECT_CALL (MockContext (mIntegration), findPlugin (Eq ("core"))).WillRepeatedly (Return (corePlugin.get ()));
-    EXPECT_CALL (corePluginMock, findSetting (Eq ("window_menu_button"))).WillRepeatedly (Return (coreWindowMenuSetting.get ()));
+    EXPECT_CALL (MockContext (mIntegration), findPlugin (Eq (corePluginName))).WillRepeatedly (Return (corePlugin.get ()));
+    EXPECT_CALL (corePluginMock, findSetting (Eq (coreSettingName))).WillRepeatedly (Return (coreWindowMenuSetting.get ()));
     EXPECT_CALL (coreWindowMenuSettingMock, getType ()).WillRepeatedly (Return (TypeButton));
     EXPECT_CALL (coreWindowMenuSettingMock, getValue ()).WillRepeatedly (Return (coreWindowMenuButton.get ()));
 
 
=== modified file 'compizconfig/libcompizconfig/include/ccs.h'
--- compizconfig/libcompizconfig/include/ccs.h	2012-09-10 01:06:55 +0000
+++ compizconfig/libcompizconfig/include/ccs.h	2012-09-25 15:17:24 +0000
@@ -772,6 +772,12 @@
 CCSSettingValueList
 ccsCopyList (CCSSettingValueList l1, CCSSetting * setting);
 
+/* Deep copy setting value */
+CCSSettingValue *
+ccsCopyValue (CCSSettingValue *orig,
+	      CCSSettingType  type,
+	      CCSSettingInfo  *info);
+
 /* Converts an array of data items to a setting value list. Behaves similar
    to ccsGetListFromStringArray */
 CCSSettingValueList ccsGetValueListFromStringArray (const char **array,
 
=== modified file 'compizconfig/libcompizconfig/src/main.c'
--- compizconfig/libcompizconfig/src/main.c	2012-09-25 08:39:18 +0000
+++ compizconfig/libcompizconfig/src/main.c	2012-09-25 15:17:24 +0000
@@ -2461,64 +2461,83 @@
     return TRUE;
 }
 
+CCSSettingValue *
+ccsCopyValue (CCSSettingValue *orig,
+	      CCSSettingType  type,
+	      CCSSettingInfo  *info)
+{
+    CCSSettingValue *value = calloc (1, sizeof (CCSSettingValue));
+
+    if (!value)
+	return NULL;
+
+    value->refCount = 1;
+    value->parent = orig->parent;
+    value->isListChild = orig->isListChild;
+
+    CCSSettingType vType = value->isListChild ? info->forList.listType : type;
+
+    switch (vType)
+    {
+	case TypeInt:
+	    value->value.asInt = orig->value.asInt;
+	    break;
+	case TypeBool:
+	    value->value.asBool = orig->value.asBool;
+	    break;
+	case TypeFloat:
+	    value->value.asFloat = orig->value.asFloat;
+	    break;
+	case TypeString:
+	    value->value.asString = strdup (orig->value.asString);
+	    break;
+	case TypeMatch:
+	    value->value.asMatch = strdup (orig->value.asMatch);
+	    break;
+	case TypeKey:
+	    memcpy (&value->value.asKey, &orig->value.asKey,
+		    sizeof (CCSSettingKeyValue));
+	    break;
+	case TypeButton:
+	    memcpy (&value->value.asButton, &orig->value.asButton,
+		    sizeof (CCSSettingButtonValue));
+	    break;
+	case TypeEdge:
+	    value->value.asEdge = orig->value.asEdge;
+	    break;
+	case TypeBell:
+	    value->value.asBell = orig->value.asBell;
+	    break;
+	case TypeColor:
+	    memcpy (&value->value.asColor, &orig->value.asColor,
+		    sizeof (CCSSettingColorValue));
+	    break;
+	default:
+	    free (value);
+	    return NULL;
+	    break;
+    }
+
+    return value;
+}
+
 CCSSettingValueList
 ccsCopyList (CCSSettingValueList l1, CCSSetting * setting)
 {
     CCSSettingInfo      *info = ccsSettingGetInfo (setting);
+    CCSSettingType      type   = ccsSettingGetType (setting);
     CCSSettingValueList l2 = NULL;
 
     while (l1)
     {
-	CCSSettingValue *value = calloc (1, sizeof (CCSSettingValue));
+	CCSSettingValue *value = ccsCopyValue (l1->data,
+					       type,
+					       info);
+
+	/* FIXME If l2 != NULL, we leak l2 */
 	if (!value)
 	    return l2;
 
-	value->refCount = 1;
-	value->parent = setting;
-	value->isListChild = TRUE;
-
-	switch (info->forList.listType)
-	{
-	case TypeInt:
-	    value->value.asInt = l1->data->value.asInt;
-	    break;
-	case TypeBool:
-	    value->value.asBool = l1->data->value.asBool;
-	    break;
-	case TypeFloat:
-	    value->value.asFloat = l1->data->value.asFloat;
-	    break;
-	case TypeString:
-	    value->value.asString = strdup (l1->data->value.asString);
-	    break;
-	case TypeMatch:
-	    value->value.asMatch = strdup (l1->data->value.asMatch);
-	    break;
-	case TypeKey:
-	    memcpy (&value->value.asKey, &l1->data->value.asKey,
-		    sizeof (CCSSettingKeyValue));
-	    break;
-	case TypeButton:
-	    memcpy (&value->value.asButton, &l1->data->value.asButton,
-		    sizeof (CCSSettingButtonValue));
-	    break;
-	case TypeEdge:
-	    value->value.asEdge = l1->data->value.asEdge;
-	    break;
-	case TypeBell:
-	    value->value.asBell = l1->data->value.asBell;
-	    break;
-	case TypeColor:
-	    memcpy (&value->value.asColor, &l1->data->value.asColor,
-		    sizeof (CCSSettingColorValue));
-	    break;
-	default:
-	  /* FIXME If l2 != NULL, we leak l2 */
-	    free (value);
-	    return NULL;
-	    break;
-	}
-
 	l2 = ccsSettingValueListAppend (l2, value);
 	l1 = l1->next;
     }