From 5e764dcac939cf6e3386234304bfa1bac862f8cf Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Wed, 12 Jul 2000 22:59:25 +0000 Subject: From addressbook/ChangeLog: 2000-07-12 Christopher James Lahey * backend/pas/pas-backend-file.c: Do case insensitive compares. * addressbook/gui/component/addressbook.c: Make quick search search both name and company name. From camel/ChangeLog: 2000-07-12 Christopher James Lahey * camel-folder-search.c, providers/imap/camel-imap-store.c: Changed from strstrcase to e_strstrcase. * string-utils.c, string-utils.h: Removed strstrcase (in favor of e_strstrcase in e-util/e-util.c.) From e-util/ChangeLog: 2000-07-12 Christopher James Lahey * e-util.c, e-util.h: Added e_strstrcase function. svn path=/trunk/; revision=4127 --- addressbook/ChangeLog | 7 +++++++ addressbook/backend/pas/pas-backend-file.c | 3 ++- addressbook/gui/component/addressbook.c | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'addressbook') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index d55cd24354..388a984cc2 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2000-07-12 Christopher James Lahey + + * backend/pas/pas-backend-file.c: Do case insensitive compares. + + * addressbook/gui/component/addressbook.c: Make quick search + search both name and company name. + 2000-07-12 Christopher James Lahey * contact-editor/e-contact-editor.c: Add icons to the toolbars. diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c index c9befc7bb1..cc7d8efe0c 100644 --- a/addressbook/backend/pas/pas-backend-file.c +++ b/addressbook/backend/pas/pas-backend-file.c @@ -22,6 +22,7 @@ #include "pas-card-cursor.h" #include #include +#include #define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION" #define PAS_BACKEND_FILE_VERSION "0.1" @@ -311,7 +312,7 @@ func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data { PASBackendFileSearchContext *ctx = data; - return entry_compare (ctx, f, argc, argv, strstr); + return entry_compare (ctx, f, argc, argv, e_strstrcase); } static char * diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index e079550d92..7295682bf7 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -426,8 +426,8 @@ search_entry_activated (GtkWidget* widget, gpointer user_data) if (search_word && strlen (search_word)) search_query = g_strdup_printf ( - "(contains \"full_name\" \"%s\")", - search_word); + "(or (contains \"full_name\" \"%s\") (contains \"org\" \"%s\"))", + search_word, search_word); else search_query = g_strdup ( "(contains \"full_name\" \"\")"); -- cgit