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

[Sam Spilsbury]

Actually change string settings to the new value, not the current one
(LP: #1042041)

Actually change string settings to the new value, not the current one. Tests updated (with matcher to actually check what value is being set, not that a value is being set):
CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/6 (0 ms)[ OK ]
CCSGSettingsIntegratedSettingTestMismatchedValues/CCSGSettingsIntegratedSettingTest.MatchedTypesReturnValueMismatchedTypesResetOrWrite/15 (0 ms)[ OK ]

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3395
http://jenkins.qa.ubuntu.com/job/compiz-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/108/console

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Blocked, waiting for fixes to the prerequisite branch.

[Daniel van Vugt (vanvugt)]

Looks fine (though I think the very long lines limit readability).

Tests pass.

Valgrind is happy too.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/288/console reported an error when processing this lp:~compiz-team/compiz/compiz.fix_1042041 branch.
Not merging it.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3397
http://jenkins.qa.ubuntu.com/job/compiz-ci/120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/120/console

review: Approve (continuous-integration)

[Martin Mrazik (mrazik)]

I'm not sure why the autolanding failed but it might be related to low disk space. I'm re-approving to see if it happens again.

[Unity Merger (unity-merger)]

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

=== 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-25 08:43:23 +0000
+++ compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c	2012-09-25 08:43:23 +0000
@@ -192,7 +192,7 @@
 		    if (currentValue)
 		    {
 			if (strcmp (currentValue, newValue) != 0)
-			    writeStringToVariant (currentValue, &newVariant);
+			    writeStringToVariant (newValue, &newVariant);
 		    }
 		}
 	    }

=== modified file 'compizconfig/integration/gnome/gsettings/tests/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp'
--- compizconfig/integration/gnome/gsettings/tests/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp	2012-09-25 08:43:23 +0000
+++ compizconfig/integration/gnome/gsettings/tests/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp	2012-09-25 08:43:23 +0000
@@ -69,6 +69,7 @@
 		    GVariant * s ();
 		    GVariant * b ();
 		    GVariant * as ();
+		    GVariant * fromValue (CCSSettingValue *v, CCSSettingType type);
 		}
 
 		namespace value_generators
@@ -124,6 +125,11 @@
     }
 }
 
+MATCHER_P (VariantEqual, lhs, "Variants Equal")
+{
+    return g_variant_equal (lhs, arg);
+}
+
 namespace
 {
     std::map <CCSSettingType, SpecialOptionType> &
@@ -169,6 +175,41 @@
 };
 
 GVariant *
+ccvg::fromValue (CCSSettingValue *v,
+		 CCSSettingType  type)
+{
+    switch (type)
+    {
+	case TypeInt:
+	    return g_variant_new ("i", v->value.asInt);
+	    break;
+	case TypeBool:
+	    return g_variant_new ("b", v->value.asBool);
+	    break;
+	case TypeString:
+	    return g_variant_new ("s", v->value.asString);
+	    break;
+	case TypeKey:
+	{
+	    GVariantBuilder builder;
+	    g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
+
+	    /* Represented internally as strings */
+	    std::string kb (v->value.asString);
+	    if (kb == "Disabled")
+		kb[0] = 'd';
+
+	    g_variant_builder_add (&builder, "s", kb.c_str ());
+	    return g_variant_builder_end (&builder);
+	}
+	default:
+	    break;
+    }
+
+    return NULL;
+}
+
+GVariant *
 ccvg::as ()
 {
     GVariantBuilder builder;
@@ -368,19 +409,23 @@
 										   mWrapper.get (),
 										   &ccsDefaultObjectAllocator);
 
-    CCSSettingValue *value = (*integratedSettingInfo.valueGenerator) ();
-    GVariant        *variant = (*integratedSettingInfo.variantGenerator) ();
-    EXPECT_CALL (*mWrapperMock, getValue (Eq (keyName))).WillOnce (Return (variant));
+    boost::shared_ptr <CCSSettingValue> value ((*integratedSettingInfo.valueGenerator) (),
+					       boost::bind (ccsFreeSettingValueWithType,
+							    _1,
+							    integratedSettingInfo.settingType));
+    boost::shared_ptr <GVariant>        variant = AutoDestroy (g_variant_ref ((*integratedSettingInfo.variantGenerator) ()),
+							       g_variant_unref);
+    boost::shared_ptr <GVariant>        newVariant = AutoDestroy (ccvg::fromValue (value.get (),
+										   integratedSettingInfo.settingType),
+								  g_variant_unref);
+    EXPECT_CALL (*mWrapperMock, getValue (Eq (keyName))).WillOnce (Return (variant.get ()));
 
     if (createSettingType == integratedSettingInfo.settingType)
-	EXPECT_CALL (*mWrapperMock, setValue (Eq (keyName), _)); // can't verify this right yet
+	EXPECT_CALL (*mWrapperMock, setValue (Eq (keyName), VariantEqual (newVariant.get ())));
     else
 	EXPECT_CALL (*mWrapperMock, resetKey (Eq (keyName)));
 
-    ccsIntegratedSettingWriteValue (gsettingsIntegrated, value, createSettingType);
-
-    if (value)
-	ccsFreeSettingValueWithType (value, integratedSettingInfo.settingType);
+    ccsIntegratedSettingWriteValue (gsettingsIntegrated, value.get (), createSettingType);
 }
 
 INSTANTIATE_TEST_CASE_P (CCSGSettingsIntegratedSettingTestMismatchedValues, CCSGSettingsIntegratedSettingTest,