From 996f1063f9f978ae36a8b9799e22748f907ed819 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Fri, 13 Jun 2003 22:27:03 +0000 Subject: don't do the CURSOR_FIRST checks if cursor is NULL [43523] 2003-06-13 Mike Kestner * e-tree.c (et_search_search): don't do the CURSOR_FIRST checks if cursor is NULL [43523] 2003-06-13 Mike Kestner * e-table-item.c (eti_get_cell_background_color): update to an alt row color more consistent with gtktreeview. [44610] svn path=/trunk/; revision=21440 --- widgets/table/e-table-item.c | 2 +- widgets/table/e-tree.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index bd6a8f3f67..b125c8495d 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -271,7 +271,7 @@ eti_get_cell_background_color (ETableItem *eti, int row, int col, gboolean selec 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); } } diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 5f06f65eb0..98d75ec642 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -480,7 +480,7 @@ et_search_search (ETableSearch *search, char *string, ETableSearchFlags flags, E 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, char *string, ETableSearchFlags flags, E 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); -- cgit v1.2.3