diff options
| author | Javier Jardón <jjardon@gnome.org> | 2011-05-02 16:13:50 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2011-05-05 12:48:09 +0100 |
| commit | 2f3e1fa3e43eb751e7d730d48d6a2787868cc8f4 (patch) | |
| tree | 4bad857d22e08f7316554545b193a9587754120f /gtk/gtkstatusicon.c | |
| parent | b8fe808e157dbe1fd12601114c391c67c03ed7a2 (diff) | |
| download | gtk+-2f3e1fa3e43eb751e7d730d48d6a2787868cc8f4.tar.gz | |
gtk/gtktrayicon-x11.c: Use GdkRGBA instead GdkColor
Diffstat (limited to 'gtk/gtkstatusicon.c')
| -rw-r--r-- | gtk/gtkstatusicon.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c index 170c780e05..0501117545 100644 --- a/gtk/gtkstatusicon.c +++ b/gtk/gtkstatusicon.c @@ -1717,11 +1717,13 @@ static void gtk_status_icon_fg_changed (GtkStatusIcon *status_icon) { GtkStatusIconPrivate *priv = status_icon->priv; - GdkColor *color; + GdkRGBA *rgba; - g_object_get (priv->tray_icon, "fg-color", &color, NULL); - gtk_widget_modify_fg (priv->image, GTK_STATE_NORMAL, color); - gdk_color_free (color); + g_object_get (priv->tray_icon, "fg-color", &rgba, NULL); + + gtk_widget_override_color (priv->image, GTK_STATE_FLAG_NORMAL, rgba); + + gdk_rgba_free (rgba); } static void @@ -1731,7 +1733,6 @@ gtk_status_icon_color_changed (GtkTrayIcon *tray, { GtkStatusIconPrivate *priv = status_icon->priv; const gchar *name; - GdkColor *color; switch (pspec->name[0]) { @@ -1753,13 +1754,9 @@ gtk_status_icon_color_changed (GtkTrayIcon *tray, { GdkRGBA rgba; - g_object_get (priv->tray_icon, pspec->name, &color, NULL); + g_object_get (priv->tray_icon, pspec->name, &rgba, NULL); - rgba.red = color->red / 65535.; - rgba.green = color->green / 65535.; - rgba.blue = color->blue / 65535.; rgba.alpha = 1; - gdk_color_free (color); gtk_widget_override_symbolic_color (priv->image, name, &rgba); } |