summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2011-11-10 23:57:03 +0100
committerSergey V. Udaltsov <svu@gnome.org>2011-12-05 19:44:52 +0000
commit6709342d25629debcab15adbd16d7d08948e2c9e (patch)
tree967bce9521be46e3a41edfcf5d53e18dc1a613f0
parent384c553279847b467e584e1529996f1ebeeb4c95 (diff)
downloadlibgnomekbd-6709342d25629debcab15adbd16d7d08948e2c9e.tar.gz
GtkTrayIcon:fg-color is a GdkRGBA
... and not a GdkColor. So use the right variable, and the right free function. Fixes a crash on session startup in gnome-settings-daemon, when using the gnome3 fallback session. https://bugzilla.gnome.org/show_bug.cgi?id=663816
-rw-r--r--libgnomekbd/gkbd-status.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
index 2f5b41f..10c95bc 100644
--- a/libgnomekbd/gkbd-status.c
+++ b/libgnomekbd/gkbd-status.c
@@ -126,7 +126,7 @@ static void
gkbd_status_render_cairo (GkbdStatusPrivHack * gkh, cairo_t * cr, int group)
{
double r, g, b;
- GdkColor *fg_color;
+ GdkRGBA *fg_color;
gchar *font_family;
int font_size;
PangoFontDescription *pfd;
@@ -155,7 +155,7 @@ gkbd_status_render_cairo (GkbdStatusPrivHack * gkh, cairo_t * cr, int group)
g_object_get (gkh->tray_icon, "fg-color", &fg_color, NULL);
cairo_set_source_rgb (cr, fg_color->red, fg_color->green, fg_color->blue);
- gdk_color_free (fg_color);
+ gdk_rgba_free (fg_color);
gkbd_indicator_config_get_font_for_widget (ind_cfg,
gkh->tray_icon,