Merge lp:~3v1n0/unity-control-center/fix-grouped-gsettings-set into lp:unity-control-center

[Marco Trevisan (Treviño)]

GroupedGSettings: ensure we ref the variant's before setting them

Otherwise when we set floating references they get consumed
by the first call to g_settings_set_value and the value becomes
invalid. Thus we need to remove the floating reference, and
manually ref and unref.

[lp:~3v1n0/unity-control-center/fix-grouped-gsettings-set]

12915. By Marco Trevisan (Treviño) on 2017-07-06

appearance: fix a typo causing not using the proper variable on vsize

Not triggering a bug for how the code is made, though.

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c	2017-06-27 23:36:48 +0000
+++ panels/appearance/cc-appearance-panel.c	2017-07-06 23:31:49 +0000
@@ -468,10 +468,16 @@
                              GVariant         *value)
 {
   GList *l;
+
   g_return_if_fail (IS_GSETTINGS_GROUPED (self));
+  g_return_if_fail (g_variant_get_type (value));
+
+  g_variant_ref_sink (value);
 
   for (l = self->priv->settings_list; l; l = l->next)
     g_settings_set_value (G_SETTINGS (l->data), key, value);
+
+  g_variant_unref (value);
 }
 
 static GSettings *
@@ -1864,7 +1870,7 @@
   }
 
   grouped_gsettings_set_value (priv->compizcore_compiz_gs, COMPIZCORE_HSIZE_KEY, g_variant_new_int32 (hsize));
-  grouped_gsettings_set_value (priv->compizcore_compiz_gs, COMPIZCORE_VSIZE_KEY, g_variant_new_int32 (hsize));
+  grouped_gsettings_set_value (priv->compizcore_compiz_gs, COMPIZCORE_VSIZE_KEY, g_variant_new_int32 (vsize));
 }
 
 static void