Correctly get foreground-gdk color

From: Xavier Claessens <xclaesse@gmail.com>

svn path=/trunk/; revision=2711

diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index 458543fa405de3182fdcaa3f23eca1fd3c0b9f46..0561ecac050e7f192cfcede7c4ec485b0ed02df9 100644 (file)
--- 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 a67536fb423773037fc40c76070b42f38d69c01d..841e26297c6c355527e1e37f3bdb3c7faeed7762 100644 (file)
--- 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);