aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2009-03-18 04:18:35 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-03-18 04:18:35 +0800
commitc1e9e11bfdd18eb2a92ae2082526264240288310 (patch)
treee5e83a818eb59f56fee6c528f21f8e948cfc30ac /libempathy-gtk
parent4eb2dc84942d6b5b8545667709978b57038e1982 (diff)
downloadgsoc2013-empathy-c1e9e11bfdd18eb2a92ae2082526264240288310.tar
gsoc2013-empathy-c1e9e11bfdd18eb2a92ae2082526264240288310.tar.gz
gsoc2013-empathy-c1e9e11bfdd18eb2a92ae2082526264240288310.tar.bz2
gsoc2013-empathy-c1e9e11bfdd18eb2a92ae2082526264240288310.tar.lz
gsoc2013-empathy-c1e9e11bfdd18eb2a92ae2082526264240288310.tar.xz
gsoc2013-empathy-c1e9e11bfdd18eb2a92ae2082526264240288310.tar.zst
gsoc2013-empathy-c1e9e11bfdd18eb2a92ae2082526264240288310.zip
Correctly get foreground-gdk color
From: Xavier Claessens <xclaesse@gmail.com> svn path=/trunk/; revision=2711
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-theme-boxes.c8
-rw-r--r--libempathy-gtk/empathy-theme-manager.c3
2 files changed, 5 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index 458543fa4..0561ecac0 100644
--- a/libempathy-gtk/empathy-theme-boxes.c
+++ b/libempathy-gtk/empathy-theme-boxes.c
@@ -275,10 +275,12 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
tag = gtk_text_tag_table_lookup (table, EMPATHY_THEME_BOXES_TAG_HEADER);
g_object_get (tag, "foreground-set", &color_set, NULL);
if (color_set) {
- GdkColor color;
+ GdkColor *color;
+
g_object_get (tag, "foreground-gdk", &color, NULL);
- gtk_widget_modify_fg (label1, GTK_STATE_NORMAL, &color);
- gtk_widget_modify_fg (label2, GTK_STATE_NORMAL, &color);
+ gtk_widget_modify_fg (label1, GTK_STATE_NORMAL, color);
+ gtk_widget_modify_fg (label2, GTK_STATE_NORMAL, color);
+ gdk_color_free (color);
}
/* Pack labels into the box */
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index a67536fb4..841e26297 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -231,14 +231,11 @@ theme_manager_update_boxes_tags (EmpathyThemeBoxes *theme,
/* Define BOXES tags */
tag = empathy_chat_text_view_tag_set (view, EMPATHY_THEME_BOXES_TAG_HEADER,
"weight", PANGO_WEIGHT_BOLD,
- "foreground", header_foreground,
- "paragraph-background", header_background,
NULL);
TAG_SET ("foreground", "foreground-set", header_foreground);
TAG_SET ("paragraph-background", "paragraph-background-set", header_background);
tag = empathy_chat_text_view_tag_set (view, EMPATHY_THEME_BOXES_TAG_HEADER_LINE,
"size", 1,
- "paragraph-background", header_line_background,
NULL);
TAG_SET ("paragraph-background", "paragraph-background-set", header_line_background);