diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-15 11:27:31 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-15 11:27:31 +0800 |
| commit | f7e298665b02f72890c6681e6d21ef5601beccbb (patch) | |
| tree | 4df0be16faf8d03b1881bd5f9e89280195ec341c /calendar/gui/e-week-view.c | |
| parent | ccd8e3964f548798eb05a430b3ea81b2760069cc (diff) | |
| download | gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar.gz gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar.zst gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.zip | |
Merge revisions 37200:3266 from trunk.
svn path=/branches/kill-bonobo/; revision=37270
Diffstat (limited to 'calendar/gui/e-week-view.c')
| -rw-r--r-- | calendar/gui/e-week-view.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 8614141b6e..290a6831ed 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -817,7 +817,7 @@ get_digit_width (PangoLayout *layout) static GdkColor e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidget *widget) { - GdkColor color, bg_color; + GdkColor bg_color; guint16 red, green, blue; gdouble cc = 65535.0; @@ -837,11 +837,9 @@ e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidg } if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 )) - color = widget->style->text[GTK_STATE_NORMAL]; + return widget->style->black; else - color = widget->style->text[GTK_STATE_ACTIVE]; - - return color; + return widget->style->white; } static void |