[evolution-patches] patch for addressbook #42472

[Chris Toshok <toshok ximian com>]

this fixes it as much as is possible in the addressbook.  it still
doesn't get it completely right, as the selection color in e-text is
wrong because it never things it owns the selection (has_selection is
always FALSE)  but that's cosmetic and i'm loathe to churn the e-text
code more before release.

Chris

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1403
diff -u -r1.1403 ChangeLog
--- ChangeLog	14 May 2003 00:45:18 -0000	1.1403
+++ ChangeLog	14 May 2003 21:15:22 -0000
@@ -1,3 +1,11 @@
+2003-05-14  Chris Toshok  <toshok ximian com>
+
+	* gui/widgets/e-minicard-label.c (set_colors): if we've got focus,
+	set the background of the rect to bg[NORMAL], and the fill color
+	of the text and label to text[NORMAL].  This will make the
+	background a different color than the canvas, but won't make it
+	use the selected background.  fixes #42472
+
 2003-05-13  Chris Toshok  <toshok ximian com>
 
 	* gui/component/select-names/e-select-names-text-model.c
Index: gui/widgets/e-minicard-label.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard-label.c,v
retrieving revision 1.34
diff -u -r1.34 e-minicard-label.c
--- gui/widgets/e-minicard-label.c	8 Apr 2003 04:44:56 -0000	1.34
+++ gui/widgets/e-minicard-label.c	14 May 2003 21:15:23 -0000
@@ -365,7 +365,6 @@
 		break;
 	case GDK_FOCUS_CHANGE: {
 		GdkEventFocus *focus_event = (GdkEventFocus *) event;
-		GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
 
 		e_minicard_label->has_focus = focus_event->in;
 		set_colors (e_minicard_label);
@@ -420,15 +419,15 @@
 		if (label->has_focus) {
 			gnome_canvas_item_set (label->rect, 
 					       "outline_color_gdk", &style->mid[GTK_STATE_SELECTED],
-					       "fill_color_gdk", &style->bg[GTK_STATE_SELECTED],
+					       "fill_color_gdk", &style->bg[GTK_STATE_NORMAL],
 					       NULL);
 
 			gnome_canvas_item_set (label->field,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_SELECTED],
+					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
 					       NULL);
 
 			gnome_canvas_item_set (label->fieldname,
-					       "fill_color_gdk", &canvas->style->text[GTK_STATE_SELECTED],
+					       "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
 					       NULL);
 		}
 		else {