evolution r37262 - in trunk/calendar: . gui

[mcrha svn gnome org]

Author: mcrha
Date: Fri Feb 13 16:44:13 2009
New Revision: 37262
URL: http://svn.gnome.org/viewvc/evolution?rev=37262&view=rev

Log:
2009-02-13  Chow Loong Jin <hyperair gmail com>

	** Fixes bug #571625

	* calendar/gui/e-day-view.c
	* calendar/gui/e-week-view.c:
	Use black/white for foreground instead of active/inactive text color



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/gui/e-day-view.c
   trunk/calendar/gui/e-week-view.c

Modified: trunk/calendar/gui/e-day-view.c
==============================================================================
--- trunk/calendar/gui/e-day-view.c	(original)
+++ trunk/calendar/gui/e-day-view.c	Fri Feb 13 16:44:13 2009
@@ -1237,7 +1237,7 @@
 static GdkColor
 e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *widget)
 {
-	GdkColor color, bg_color;
+	GdkColor bg_color;
 	guint16 red, green, blue;
 	gdouble	cc = 65535.0;
 
@@ -1257,11 +1257,9 @@
        	}
 
 	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

Modified: trunk/calendar/gui/e-week-view.c
==============================================================================
--- trunk/calendar/gui/e-week-view.c	(original)
+++ trunk/calendar/gui/e-week-view.c	Fri Feb 13 16:44:13 2009
@@ -816,7 +816,7 @@
 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;
 
@@ -836,11 +836,9 @@
        	}
 
 	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