[evolution-patches] 43523: search crash with null cursor

[Mike Kestner <mkestner ximian com>]

This patch makes the CURSOR_FIRST parts of e-tree searching contingent
on there actually being a cursor.  :/  It's also got the 44610 fix again
since I was too lazy to split it out.

Mike

Index: gal/e-table/ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/ChangeLog,v
retrieving revision 1.903
diff -u -p -r1.903 ChangeLog
--- gal/e-table/ChangeLog	12 Jun 2003 13:35:46 -0000	1.903
+++ gal/e-table/ChangeLog	13 Jun 2003 20:26:19 -0000
@@ -1,3 +1,13 @@
+2003-06-13  Mike Kestner  <mkestner ximian com>
+
+	* e-tree.c (et_search_search): don't do the CURSOR_FIRST
+	checks if cursor is NULL [43523]
+
+2003-06-13  Mike Kestner  <mkestner ximian com>
+
+	* e-table-item.c (eti_get_cell_background_color): update to
+	an alt row color more consistent with gtktreeview. [44610]
+
 2003-06-12  Mike Kestner  <mkestner ximian com>
 
 	* e-cell-text.c (generate_layout): guard against NULL strings
Index: gal/e-table/e-table-item.c
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/e-table-item.c,v
retrieving revision 1.223
diff -u -p -r1.223 e-table-item.c
--- gal/e-table/e-table-item.c	16 May 2003 21:58:32 -0000	1.223
+++ gal/e-table/e-table-item.c	13 Jun 2003 20:26:21 -0000
@@ -271,7 +271,7 @@ eti_get_cell_background_color (ETableIte
 				background = gdk_color_copy (background);
 				allocated = TRUE;
 			}
-			e_hsv_tweak (background, 0.0f, 0.0f, -0.05f);
+			e_hsv_tweak (background, 0.0f, 0.0f, -0.07f);
 			gdk_color_alloc (gtk_widget_get_colormap (GTK_WIDGET (canvas)), background);
 		}
 	}
Index: gal/e-table/e-tree.c
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/e-tree.c,v
retrieving revision 1.103
diff -u -p -r1.103 e-tree.c
--- gal/e-table/e-tree.c	12 Jun 2003 13:35:46 -0000	1.103
+++ gal/e-table/e-tree.c	13 Jun 2003 20:26:22 -0000
@@ -480,7 +480,7 @@ et_search_search (ETableSearch *search, 
 
 	cursor = e_tree_get_cursor (et);
 
-	if (flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST) {
+	if (cursor && (flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST)) {
 		const void *value;
 
 		value = e_tree_model_value_at (et->priv->model, cursor, col->col_idx);
@@ -504,7 +504,7 @@ et_search_search (ETableSearch *search, 
 
 		e_selection_model_select_as_key_press(E_SELECTION_MODEL (et->priv->selection), model_row, col->col_idx, GDK_CONTROL_MASK);
 		return TRUE;
-	} else if (!(flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST)) {
+	} else if (cursor && !(flags & E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST)) {
 		const void *value;
 
 		value = e_tree_model_value_at (et->priv->model, cursor, col->col_idx);