[evolution/gnome-3-24] Bug 782052 - Today in mini-calendar not easy to distinguish from selected days

[Milan Crha <mcrha src gnome org>]

commit 863abdfd1db864cc80d94bd45549f45abdb12e4c
Author: Milan Crha <mcrha redhat com>
Date:   Tue May 30 15:17:55 2017 +0200

    Bug 782052 - Today in mini-calendar not easy to distinguish from selected days

 src/e-util/e-calendar-item.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/e-util/e-calendar-item.c b/src/e-util/e-calendar-item.c
index b0578b8..ecbedbd 100644
--- a/src/e-util/e-calendar-item.c
+++ b/src/e-util/e-calendar-item.c
@@ -3492,15 +3492,19 @@ void
 e_calendar_item_style_updated (GtkWidget *widget,
                               ECalendarItem *calitem)
 {
-       GdkRGBA selected_bg, fg, base_bg;
+       GdkRGBA unfocused_selected_bg, selected_bg, fg, base_bg;
 
        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_unfocused_selected_bg_color,theme_selected_bg_color", 
E_UTILS_DEFAULT_THEME_UNFOCUSED_SELECTED_BG_COLOR, &unfocused_selected_bg);
        e_utils_get_theme_color (widget, "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, &base_bg);
 
+       if (gdk_rgba_equal (&selected_bg, &unfocused_selected_bg))
+               e_utils_get_theme_color (widget, "theme_selected_fg_color", 
E_UTILS_DEFAULT_THEME_SELECTED_FG_COLOR, &selected_bg);
+
        e_rgba_to_color (&selected_bg, &calitem->colors[E_CALENDAR_ITEM_COLOR_TODAY_BOX]);
        e_rgba_to_color (&base_bg, &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_FG]);
-       e_rgba_to_color (&selected_bg, &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG_FOCUSED]);
+       e_rgba_to_color (&unfocused_selected_bg, 
&calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG_FOCUSED]);
        e_rgba_to_color (&fg, &calitem->colors[E_CALENDAR_ITEM_COLOR_SELECTION_BG]);
        e_rgba_to_color (&fg, &calitem->colors[E_CALENDAR_ITEM_COLOR_PREV_OR_NEXT_MONTH_FG]);