]> Pileus Git - ~andy/gtk/commitdiff
gdkcreen-x11: Use GdkRGBA instead GdkColor
authorJavier Jardón <jjardon@gnome.org>
Mon, 13 Jun 2011 00:54:02 +0000 (01:54 +0100)
committerJavier Jardón <jjardon@gnome.org>
Sat, 1 Oct 2011 19:45:27 +0000 (20:45 +0100)
gdk/x11/gdkscreen-x11.c

index 2c31eddcf420aa0f5947ea7d17eb98a7c7cc62ef..64e488f6d1b276d4dbe941cd484d573e4cd28ee5 100644 (file)
@@ -1161,18 +1161,18 @@ gdk_x11_screen_get_setting (GdkScreen   *screen,
        }
       break;
     case XSETTINGS_TYPE_COLOR:
-      if (!check_transform (xsettings_name, GDK_TYPE_COLOR, G_VALUE_TYPE (value)))
+      if (!check_transform (xsettings_name, GDK_TYPE_RGBA, G_VALUE_TYPE (value)))
        {
-         GdkColor color;
+         GdkRGBA rgba;
 
-         g_value_init (&tmp_val, GDK_TYPE_COLOR);
+         g_value_init (&tmp_val, GDK_TYPE_RGBA);
 
-         color.pixel = 0;
-         color.red = setting->data.v_color.red;
-         color.green = setting->data.v_color.green;
-         color.blue = setting->data.v_color.blue;
+         rgba.red = setting->data.v_color.red / 65535.0;
+         rgba.green = setting->data.v_color.green / 65535.0;
+         rgba.blue = setting->data.v_color.blue / 65535.0;
+         rgba.alpha = setting->data.v_color.alpha / 65535.0;
 
-         g_value_set_boxed (&tmp_val, &color);
+         g_value_set_boxed (&tmp_val, &rgba);
 
          g_value_transform (&tmp_val, value);