From abd6567ea011ed5546aa8b17bea86567ad9fb5f7 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Wed, 13 Mar 2002 07:10:22 +0000 Subject: Replaced e_marshal_BOOL__STRING with this since the function it was used 2002-03-13 Christopher James Lahey * gal/util/e-util.c, gal/util/e-util.h (e_marshal_BOOL__STRING_INT): Replaced e_marshal_BOOL__STRING with this since the function it was used for has been modified. From gal/e-table/ChangeLog: 2002-03-13 Christopher James Lahey * e-table-extras.c (e_string_search): Check for a NULL haystack here. * e-table-search.c, e-table-search.h: Added a parameter to the search signal here to pass in flags. Specifically, added the E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST flag. Improved the search behavior here. * e-table.c, e-tree.c: Handle the new signature for the search signal here. svn path=/trunk/; revision=16139 --- widgets/table/e-table-extras.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'widgets/table/e-table-extras.c') diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index 9f80557901..e9a18b4f8e 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -102,7 +102,11 @@ e_strint_compare(gconstpointer data1, gconstpointer data2) static gboolean e_string_search(gconstpointer haystack, const char *needle) { - int length = g_utf8_strlen (needle, -1); + int length; + if (haystack == NULL) + return FALSE; + + length = g_utf8_strlen (needle, -1); if (g_utf8_strncasecmp (haystack, needle, length) == 0) return TRUE; else -- cgit v1.2.3