Merge lp:~seb128/gnome-control-center-unity/use-correct-color-raring into lp:gnome-control-center-unity/raring

[Sebastien Bacher]

use the correct colors format for the background settings

libgnome-desktop is using GdkColor values but the code was writing GdkRGBA ones. The first one are deprecated but since that's what the other components want, that's what we should write.

use the correct colors format for the background settings

libgnome-desktop is using GdkColor values but the code was writing GdkRGBA ones. The first one are deprecated but since that's what the other components want, that's what we should write.

[Michael Terry (mterry)]

Looks fine! Thanks, Seb.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/gnome-control-center-unity-raring-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gnome-control-center-unity-raring-raring-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gnome-control-center-unity-raring-raring-armhf-ci/1

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

review: Approve (continuous-integration)

=== modified file 'appearance/cc-appearance-panel.c'
--- appearance/cc-appearance-panel.c	2013-04-08 09:16:43 +0000
+++ appearance/cc-appearance-panel.c	2013-06-12 17:08:29 +0000
@@ -874,15 +874,15 @@
                   CcAppearancePanel *panel)
 {
   CcAppearancePanelPrivate *priv = panel->priv;
-  GdkRGBA color;
+  GdkColor color;
   gchar *value;
   gboolean is_pcolor = FALSE;
 
-  gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &color);
+  gtk_color_button_get_color (button, &color);
   if (WID ("style-pcolor") == GTK_WIDGET (button))
     is_pcolor = TRUE;
 
-  value = gdk_rgba_to_string (&color);
+  value = gdk_color_to_string (&color);
 
   if (priv->current_background)
     {