From e061c100c7ef9d316a33bfb537022d5b8b307389 Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Thu, 21 Jun 2001 18:58:15 +0000 Subject: Renamed. (The old name, edit_contact_info_have_book_cb was a hold-over 2001-06-21 Jon Trowbridge * gui/component/select-names/e-select-names-popup.c (make_contact_editor_cb): Renamed. (The old name, edit_contact_info_have_book_cb was a hold-over from before, when we weren't using e_book_use_local_address_book.) * gui/component/e-address-popup.c (e_address_popup_schedule_refresh): A Added. We now do the name refreshes in an idle function, rather than in the setters. (e_address_popup_set_free_form): Added. Properly handle inputs of the form "Foo ", extracting the name and e-mail address. (e_address_popup_set_name): Check to make sure that the free-form handler shouldn't be used to handle the input. Schedule a refresh after making any changes. (e_address_popup_set_email): Check to make sure that the free-form handler shouldn't be used to handle the input. Schedule a refresh after making any changes. (e_address_popup_name_only_matches): Temporary place-holder for handling name-only matches. (query_cb): If our initial query fails (and included e-mail information), do a name-only query. This is to handle the case of adding new e-mail addresses to existing contacts. (e_address_popup_query): Eliminated the "common_book" crap; using e_book_use_local_address_book instead. * backend/ebook/e-card-compare.c (match_search_info_free): Make sure that the ->avoid list gets properly freed. svn path=/trunk/; revision=10374 --- addressbook/gui/component/select-names/e-select-names-popup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/component/select-names') diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c index 4cea4dfb86..03dadf2d80 100644 --- a/addressbook/gui/component/select-names/e-select-names-popup.c +++ b/addressbook/gui/component/select-names/e-select-names-popup.c @@ -94,7 +94,7 @@ popup_info_cleanup (GtkWidget *w, gpointer info) /* You are in a maze of twisty little callbacks, all alike... */ static void -edit_contact_info_have_book_cb (EBook *book, gpointer user_data) +make_contact_editor_cb (EBook *book, gpointer user_data) { if (book) { EDestination *dest = E_DESTINATION (user_data); @@ -116,7 +116,7 @@ edit_contact_info_cb (GtkWidget *w, gpointer user_data) return; gtk_object_ref (GTK_OBJECT (info->dest)); - e_book_use_local_address_book (edit_contact_info_have_book_cb, (gpointer) info->dest); + e_book_use_local_address_book (make_contact_editor_cb, (gpointer) info->dest); } static void -- cgit v1.2.3