--- Begin Message ---
Package: evolution
Version: 3.12.6-1
Severity: minor
Dear Maintainer,
Please find attached a patch that renames a color label that is no longer
available in gtk 3.14 - fixing unreadable message pane in dark variant.
Forwarded upstream.
Jérémy.
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (670, 'unstable'), (650, 'testing'), (590, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages evolution depends on:
ii dbus 1.8.8-1
ii debconf [debconf-2.0] 1.5.53
ii evolution-common 3.12.6-1
ii evolution-data-server 3.12.6-1
ii gnome-icon-theme 3.12.0-1
ii libatk1.0-0 2.13.90-1
ii libc6 2.19-11
ii libcamel-1.2-49 3.12.6-1
ii libclutter-gtk-1.0-0 1.6.0-1
ii libecal-1.2-16 3.12.6-1
ii libedataserver-1.2-18 3.12.6-1
ii libevolution 3.12.6-1
ii libglib2.0-0 2.42.0-1
ii libgtk-3-0 3.14.0-1
ii libical1 1.0-1
ii libnotify4 0.7.6-2
ii libsoup2.4-1 2.48.0-1
ii libwebkitgtk-3.0-0 2.4.5-2
ii libxml2 2.9.1+dfsg1-4
ii psmisc 22.21-2
Versions of packages evolution recommends:
ii bogofilter 1.2.4+dfsg1-3
ii evolution-plugins 3.12.6-1
ii spamassassin 3.4.0-2
ii yelp 3.14.0-1
Versions of packages evolution suggests:
pn evolution-ews <none>
pn evolution-plugins-experimental <none>
ii gnupg 1.4.18-4
ii network-manager 0.9.10.0-2.1
-- debconf information excluded
Description: theme_text_color replaced by theme_fg_color
there is no theme_text_color in gtk 3.14, this results in dark-on-dark
unreadable widgets using Adwaita dark variant.
Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=737340
Author: Jérémy Lal <kapo...@melix.org>
Last-Update: 2014-09-25
--- evolution-3.12.6.orig/addressbook/gui/widgets/e-minicard-label.c
+++ evolution-3.12.6/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_fg_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &text);
if (label->has_focus) {
GdkColor outline, fill;
--- evolution-3.12.6.orig/addressbook/gui/widgets/e-minicard.c
+++ evolution-3.12.6/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_fg_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &text);
gnome_canvas_item_set (
minicard->rect,
--- evolution-3.12.6.orig/calendar/gui/e-day-view-time-item.c
+++ evolution-3.12.6/calendar/gui/e-day-view-time-item.c
@@ -305,7 +305,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas
context, day_view->large_font_desc,
pango_context_get_language (context));
- e_utils_get_theme_color (widget, "theme_fg_color,theme_text_color", E_UTILS_DEFAULT_THEME_FG_COLOR, &fg);
+ e_utils_get_theme_color (widget, "theme_fg_color,theme_fg_color", E_UTILS_DEFAULT_THEME_FG_COLOR, &fg);
e_utils_get_theme_color (widget, "theme_base_color", E_UTILS_DEFAULT_THEME_BASE_COLOR, &dark);
/* The start and end of the long horizontal line between hours. */
--- evolution-3.12.6.orig/calendar/gui/e-memo-table.c
+++ evolution-3.12.6/calendar/gui/e-memo-table.c
@@ -502,7 +502,7 @@ memo_table_query_tooltip (GtkWidget *wid
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_fg_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &norm_text);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
--- evolution-3.12.6.orig/calendar/gui/e-task-table.c
+++ evolution-3.12.6/calendar/gui/e-task-table.c
@@ -804,7 +804,7 @@ task_table_query_tooltip (GtkWidget *wid
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_fg_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &norm_text);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
--- evolution-3.12.6.orig/calendar/gui/e-week-view.c
+++ evolution-3.12.6/calendar/gui/e-week-view.c
@@ -1737,7 +1737,7 @@ e_week_view_set_colors (EWeekView *week_
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_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);
--- evolution-3.12.6.orig/e-util/e-calendar-item.c
+++ evolution-3.12.6/e-util/e-calendar-item.c
@@ -1436,7 +1436,7 @@ e_calendar_item_draw_month (ECalendarIte
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_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 (ECalen
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_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);
--- evolution-3.12.6.orig/e-util/e-cell-text.c
+++ evolution-3.12.6/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_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_fg_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &fg_rgba);
}
indices[0] = MIN (edit->selection_start, edit->selection_end);
--- evolution-3.12.6.orig/e-util/e-table-click-to-add.c
+++ evolution-3.12.6/e-util/e-table-click-to-add.c
@@ -85,7 +85,7 @@ etcta_style_updated (ETableClickToAdd *e
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_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 *
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_fg_color", E_UTILS_DEFAULT_THEME_TEXT_COLOR, &text);
if (!etcta->rect)
etcta->rect = gnome_canvas_item_new (
--- evolution-3.12.6.orig/e-util/e-text.c
+++ evolution-3.12.6/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_fg_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);
--- End Message ---
