From 37f85438b274e6285335f8484031f06522ce1fe2 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 9 Aug 2000 05:12:19 +0000 Subject: use x-evolution-any-field. 2000-08-08 Chris Toshok * gui/component/e-addressbook-model.c (e_addressbook_model_init): use x-evolution-any-field. * gui/component/addressbook.c (search_entry_activated): use x-evolution-any-field. (change_view_type): same. * gui/minicard/e-minicard-view.c (e_minicard_view_init): set query to x-evolution-any-field. * backend/pas/pas-backend-ldap.c (func_contains): support x-evolution-any-field for matching any evolution supported field. * backend/pas/pas-backend-file.c (compare_email): switch to using ECardSimple calls. (compare_phone): same. (compare_address): same. (entry_compare): switch to using ECardSimple calls, and support a 'x-evolution-any-field' wildcard field. (vcard_matches_search): use an ECardSimple. svn path=/trunk/; revision=4626 --- addressbook/gui/component/addressbook.c | 4 ++-- addressbook/gui/component/e-addressbook-model.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index bf2b054280..d25e41c313 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -438,7 +438,7 @@ search_entry_activated (GtkWidget* widget, gpointer user_data) if (search_word && strlen (search_word)) search_query = g_strdup_printf ( - "(or (contains \"full_name\" \"%s\") (contains \"org\" \"%s\"))", + "(contains \"x-evolution-any-field\" \"%s\")", search_word, search_word); else search_query = g_strdup ( @@ -1023,7 +1023,7 @@ change_view_type (AddressbookView *view, AddressbookViewType view_type) if (view->view_type != ADDRESSBOOK_VIEW_NONE) query = get_query(view); else - query = g_strdup("(contains \"full_name\" \"\")"); + query = g_strdup("(contains \"x-evolution-any-field\" \"\")"); switch (view_type) { diff --git a/addressbook/gui/component/e-addressbook-model.c b/addressbook/gui/component/e-addressbook-model.c index 87b872784c..d46b42fe00 100644 --- a/addressbook/gui/component/e-addressbook-model.c +++ b/addressbook/gui/component/e-addressbook-model.c @@ -254,7 +254,7 @@ e_addressbook_model_init (GtkObject *object) { EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object); model->book = NULL; - model->query = g_strdup("(contains \"full_name\" \"\")"); + model->query = g_strdup("(contains \"x-evolution-any-field\" \"\")"); model->book_view = NULL; model->get_view_idle = 0; model->create_card_id = 0; -- cgit v1.2.3