GNOME.org
 

[evolution/evolution-3-12] Bug 737340 - theme_text_color is no longer in gtk 3.14

commit 9c6219ce1ecfa24e0d2f314a536156354fef736a
Author: Jérémy Lal <kapouer melix org>
Date:   Thu Oct 9 11:11:56 2014 +0200

    Bug 737340 - theme_text_color is no longer in gtk 3.14

 addressbook/gui/widgets/e-minicard-label.c |    2 +-
 addressbook/gui/widgets/e-minicard.c       |    2 +-
 calendar/gui/e-memo-table.c                |    2 +-
 calendar/gui/e-task-table.c                |    2 +-
 calendar/gui/e-week-view.c                 |    2 +-
 e-util/e-calendar-item.c                   |    4 ++--
 e-util/e-cell-text.c                       |    4 ++--
 e-util/e-table-click-to-add.c              |    4 ++--
 e-util/e-text.c                            |    2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 7e80945..c6d8dff 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -422,7 +422,7 @@ set_colors (EMinicardLabel *label)
 
                widget = GTK_WIDGET (GNOME_CANVAS_ITEM (label)->canvas);
 
-               e_utils_get_theme_color_color (widget, "theme_text_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, 
&text);
+               e_utils_get_theme_color_color (widget, "theme_text_color,theme_fg_color", 
E_UTILS_DEFAULT_THEME_TEXT_COLOR, &text);
 
                if (label->has_focus) {
                        GdkColor outline, fill;
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index f2e69ce..5713976 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -283,7 +283,7 @@ set_selected (EMinicard *minicard,
                        NULL);
        } else {
                e_utils_get_theme_color_color (widget, "theme_bg_color", E_UTILS_DEFAULT_THEME_BG_COLOR, 
&header);
-               e_utils_get_theme_color_color (widget, "theme_text_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, 
&text);
+               e_utils_get_theme_color_color (widget, "theme_text_color,theme_fg_color", 
E_UTILS_DEFAULT_THEME_TEXT_COLOR, &text);
 
                gnome_canvas_item_set (
                        minicard->rect,
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 146a63b..88eb4e2 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -502,7 +502,7 @@ memo_table_query_tooltip (GtkWidget *widget,
        e_utils_get_theme_color (widget, "theme_selected_bg_color", E_UTILS_DEFAULT_THEME_SELECTED_BG_COLOR, 
&sel_bg);
        e_utils_get_theme_color (widget, "theme_selected_fg_color", E_UTILS_DEFAULT_THEME_SELECTED_FG_COLOR, 
&sel_fg);
        e_utils_get_theme_color (widget, "theme_bg_color", E_UTILS_DEFAULT_THEME_BG_COLOR, &norm_bg);
-       e_utils_get_theme_color (widget, "theme_text_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &norm_text);
+       e_utils_get_theme_color (widget, "theme_text_color,theme_fg_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, 
&norm_text);
 
        box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index 036d643..418536d 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -804,7 +804,7 @@ task_table_query_tooltip (GtkWidget *widget,
        e_utils_get_theme_color (widget, "theme_selected_bg_color", E_UTILS_DEFAULT_THEME_SELECTED_BG_COLOR, 
&sel_bg);
        e_utils_get_theme_color (widget, "theme_selected_fg_color", E_UTILS_DEFAULT_THEME_SELECTED_FG_COLOR, 
&sel_fg);
        e_utils_get_theme_color (widget, "theme_bg_color", E_UTILS_DEFAULT_THEME_BG_COLOR, &norm_bg);
-       e_utils_get_theme_color (widget, "theme_text_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &norm_text);
+       e_utils_get_theme_color (widget, "theme_text_color,theme_fg_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, 
&norm_text);
 
        box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 1c5a189..039ea68 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -1737,7 +1737,7 @@ e_week_view_set_colors (EWeekView *week_view)
 
        e_utils_get_theme_color (widget, "theme_base_color", E_UTILS_DEFAULT_THEME_BASE_COLOR, &base_bg);
        e_utils_get_theme_color (widget, "theme_bg_color", E_UTILS_DEFAULT_THEME_BG_COLOR, &bg_bg);
-       e_utils_get_theme_color (widget, "theme_text_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &text_fg);
+       e_utils_get_theme_color (widget, "theme_text_color,theme_fg_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, 
&text_fg);
        e_utils_get_theme_color (widget, "theme_selected_bg_color", E_UTILS_DEFAULT_THEME_SELECTED_BG_COLOR, 
&selected_bg);
        e_utils_get_theme_color (widget, "theme_selected_fg_color", E_UTILS_DEFAULT_THEME_SELECTED_FG_COLOR, 
&selected_fg);
        e_utils_get_theme_color (widget, "theme_unfocused_selected_bg_color,theme_selected_bg_color", 
E_UTILS_DEFAULT_THEME_UNFOCUSED_SELECTED_BG_COLOR, &unfocused_selected_bg);
diff --git a/e-util/e-calendar-item.c b/e-util/e-calendar-item.c
index 0527dc2..a8159b0 100644
--- a/e-util/e-calendar-item.c
+++ b/e-util/e-calendar-item.c
@@ -1436,7 +1436,7 @@ e_calendar_item_draw_month (ECalendarItem *calitem,
        pango_layout_set_font_description (layout, font_desc);
        if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
                text_x += (7 - 1) * calitem->cell_width;
-       e_utils_get_theme_color (widget, "theme_text_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &rgba);
+       e_utils_get_theme_color (widget, "theme_text_color,theme_fg_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, 
&rgba);
        gdk_cairo_set_source_rgba (cr, &rgba);
        for (day = 0; day < 7; day++) {
                cairo_save (cr);
@@ -1646,7 +1646,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem *calitem,
                                get_digit_fomat (), digit);
 
                        cairo_save (cr);
-                       e_utils_get_theme_color (widget, "theme_text_color", 
E_UTILS_DEFAULT_THEME_TEXT_COLOR, &rgba);
+                       e_utils_get_theme_color (widget, "theme_text_color,theme_fg_color", 
E_UTILS_DEFAULT_THEME_TEXT_COLOR, &rgba);
                        gdk_cairo_set_source_rgba (cr, &rgba);
                        pango_layout_set_font_description (layout, font_desc);
                        pango_layout_set_text (layout, buffer, num_chars);
diff --git a/e-util/e-cell-text.c b/e-util/e-cell-text.c
index a0644a6..362dbae 100644
--- a/e-util/e-cell-text.c
+++ b/e-util/e-cell-text.c
@@ -725,7 +725,7 @@ ect_draw (ECellView *ecell_view,
        } else {
                gboolean color_overwritten = FALSE;
 
-               e_utils_get_theme_color (canvas, "theme_text_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, 
&fg_rgba);
+               e_utils_get_theme_color (canvas, "theme_text_color,theme_fg_color", 
E_UTILS_DEFAULT_THEME_TEXT_COLOR, &fg_rgba);
                gdk_cairo_set_source_rgba (cr, &fg_rgba);
 
                if (ect->color_column != -1) {
@@ -820,7 +820,7 @@ ect_draw (ECellView *ecell_view,
                                }
                        } else {
                                e_utils_get_theme_color (canvas, "theme_base_color", 
E_UTILS_DEFAULT_THEME_BASE_COLOR, &bg_rgba);
-                               e_utils_get_theme_color (canvas, "theme_text_color", 
E_UTILS_DEFAULT_THEME_TEXT_COLOR, &fg_rgba);
+                               e_utils_get_theme_color (canvas, "theme_text_color,theme_fg_color", 
E_UTILS_DEFAULT_THEME_TEXT_COLOR, &fg_rgba);
                        }
 
                        indices[0] = MIN (edit->selection_start, edit->selection_end);
diff --git a/e-util/e-table-click-to-add.c b/e-util/e-table-click-to-add.c
index 4295c90..6dc8138 100644
--- a/e-util/e-table-click-to-add.c
+++ b/e-util/e-table-click-to-add.c
@@ -85,7 +85,7 @@ etcta_style_updated (ETableClickToAdd *etcta)
 
        e_utils_get_theme_color_color (widget, "theme_fg_color", E_UTILS_DEFAULT_THEME_FG_COLOR, &fg);
        e_utils_get_theme_color_color (widget, "theme_bg_color", E_UTILS_DEFAULT_THEME_BG_COLOR, &bg);
-       e_utils_get_theme_color_color (widget, "theme_text_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &text);
+       e_utils_get_theme_color_color (widget, "theme_text_color,theme_fg_color", 
E_UTILS_DEFAULT_THEME_TEXT_COLOR, &text);
 
        if (etcta->rect)
                gnome_canvas_item_set (
@@ -266,7 +266,7 @@ create_rect_and_text (ETableClickToAdd *etcta)
 
        e_utils_get_theme_color_color (widget, "theme_fg_color", E_UTILS_DEFAULT_THEME_FG_COLOR, &fg);
        e_utils_get_theme_color_color (widget, "theme_bg_color", E_UTILS_DEFAULT_THEME_BG_COLOR, &bg);
-       e_utils_get_theme_color_color (widget, "theme_text_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &text);
+       e_utils_get_theme_color_color (widget, "theme_text_color,theme_fg_color", 
E_UTILS_DEFAULT_THEME_TEXT_COLOR, &text);
 
        if (!etcta->rect)
                etcta->rect = gnome_canvas_item_new (
diff --git a/e-util/e-text.c b/e-util/e-text.c
index e882621..e341cd9 100644
--- a/e-util/e-text.c
+++ b/e-util/e-text.c
@@ -1308,7 +1308,7 @@ e_text_draw (GnomeCanvasItem *item,
                        gdk_cairo_set_source_rgba (cr, &rgba);
                        cairo_paint (cr);
 
-                       e_utils_get_theme_color (widget, backdrop ? 
"theme_unfocused_text_color,theme_text_color" : "theme_text_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &rgba);
+                       e_utils_get_theme_color (widget, backdrop ? 
"theme_unfocused_text_color,theme_text_color,theme_fg_color" : "theme_text_color,theme_fg_color", 
E_UTILS_DEFAULT_THEME_TEXT_COLOR, &rgba);
                        gdk_cairo_set_source_rgba (cr, &rgba);
                        cairo_move_to (cr, xpos, ypos);
                        pango_cairo_show_layout (cr, text->layout);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]