Merge lp:~seb128/gnome-control-center-unity/swap-color-use-gdkcolor into lp:gnome-control-center-unity

[Sebastien Bacher]

Use GdkColor types, for color swapping, since that's what
libgnome-desktop uses. That's a fix similar to the one done previous to
the color selection code.

Use GdkColor types, for color swapping, since that's what
libgnome-desktop uses. That's a fix similar to the one done previous to
the color selection code.

[Sebastien Bacher (seb128)]

That's similar to https://code.launchpad.net/~seb128/gnome-control-center-unity/use-correct-color/+merge/168800 which was fixed earlier in the cycle, the color swapping code had the same issue

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/gnome-control-center-unity-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gnome-control-center-unity-saucy-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gnome-control-center-unity-saucy-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gnome-control-center-unity-saucy-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gnome-control-center-unity-ci/6/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

Makes sense.

review: Approve

[Łukasz Zemczak (sil2100)]

Works like a charm.

review: Approve

=== modified file 'appearance/cc-appearance-panel.c'
--- appearance/cc-appearance-panel.c	2013-06-11 19:57:58 +0000
+++ appearance/cc-appearance-panel.c	2013-10-04 13:30:22 +0000
@@ -411,7 +411,7 @@
 
   if (priv->current_background)
     {
-      GdkRGBA pcolor, scolor;
+      GdkColor pcolor, scolor;
       const char* bgsize = NULL;
 
       markup = g_strdup_printf ("<i>%s</i>", cc_appearance_item_get_name (priv->current_background));
@@ -428,11 +428,11 @@
       else
           gtk_label_set_text (GTK_LABEL (WID ("size_label")), "");
 
-      gdk_rgba_parse (&pcolor, cc_appearance_item_get_pcolor (priv->current_background));
-      gdk_rgba_parse (&scolor, cc_appearance_item_get_scolor (priv->current_background));
+      gdk_color_parse (cc_appearance_item_get_pcolor (priv->current_background), &pcolor);
+      gdk_color_parse (cc_appearance_item_get_scolor (priv->current_background), &scolor);
 
-      gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (WID ("style-pcolor")), &pcolor);
-      gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (WID ("style-scolor")), &scolor);
+      gtk_color_button_set_color (GTK_COLOR_BUTTON (WID ("style-pcolor")), &pcolor);
+      gtk_color_button_set_color (GTK_COLOR_BUTTON (WID ("style-scolor")), &scolor);
 
       select_style (GTK_COMBO_BOX (WID ("style-combobox")),
                     cc_appearance_item_get_placement (priv->current_background));
@@ -905,17 +905,17 @@
                      CcAppearancePanel *panel)
 {
   CcAppearancePanelPrivate *priv = panel->priv;
-  GdkRGBA pcolor, scolor;
+  GdkColor pcolor, scolor;
   char *new_pcolor, *new_scolor;
 
-  gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (WID ("style-pcolor")), &pcolor);
-  gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (WID ("style-scolor")), &scolor);
-
-  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (WID ("style-scolor")), &pcolor);
-  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (WID ("style-pcolor")), &scolor);
-
-  new_pcolor = gdk_rgba_to_string (&scolor);
-  new_scolor = gdk_rgba_to_string (&pcolor);
+  gtk_color_button_get_color (GTK_COLOR_BUTTON (WID ("style-pcolor")), &pcolor);
+  gtk_color_button_get_color (GTK_COLOR_BUTTON (WID ("style-scolor")), &scolor);
+
+  gtk_color_button_set_color (GTK_COLOR_BUTTON (WID ("style-scolor")), &pcolor);
+  gtk_color_button_set_color (GTK_COLOR_BUTTON (WID ("style-pcolor")), &scolor);
+
+  new_pcolor = gdk_color_to_string (&scolor);
+  new_scolor = gdk_color_to_string (&pcolor);
 
   g_object_set (priv->current_background,
                 "primary-color", new_pcolor,