diff options
| author | Javier Jardón <jjardon@gnome.org> | 2011-06-13 01:54:02 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2011-10-01 20:45:27 +0100 |
| commit | 522c305c12c28d68b636ca8e601de22e260cb9dc (patch) | |
| tree | 9db4faaa5972351f4b021014f8d52ff15b640635 /gdk/x11 | |
| parent | 36b2362ac9ef773f63056a7720c72e3118cad52c (diff) | |
| download | gtk+-522c305c12c28d68b636ca8e601de22e260cb9dc.tar.gz | |
gdkcreen-x11: Use GdkRGBA instead GdkColor
Diffstat (limited to 'gdk/x11')
| -rw-r--r-- | gdk/x11/gdkscreen-x11.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index 2c31eddcf4..64e488f6d1 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -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); |