From c879655ace274596ae2dd3e78e348facd821e3b7 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Mon, 17 Feb 2003 21:02:06 +0000 Subject: if we can complete solely from our cached cards, call 2003-02-17 Chris Toshok * gui/component/select-names/e-select-names-completion.c (e_select_names_completion_start_query): if we can complete solely from our cached cards, call e_completion_end_search from here when we're done. svn path=/trunk/; revision=19925 --- addressbook/ChangeLog | 13 +++++++++++++ .../gui/component/select-names/e-select-names-completion.c | 8 ++++++++ 2 files changed, 21 insertions(+) (limited to 'addressbook') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 7ed76be59c..fd7acbc72c 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,16 @@ +2003-02-17 Chris Toshok + + * gui/component/select-names/e-select-names-completion.c + (e_select_names_completion_start_query): if we can complete solely + from our cached cards, call e_completion_end_search from here when + we're done. + +2003-02-17 Chris Toshok + + * gui/component/addressbook-component.c + (ensure_completion_uris_exist): plug memory leak (always free + val). + 2003-02-16 Chris Toshok * backend/pas/pas-backend-file.c diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c index c679b51233..81f5d12353 100644 --- a/addressbook/gui/component/select-names/e-select-names-completion.c +++ b/addressbook/gui/component/select-names/e-select-names-completion.c @@ -924,6 +924,7 @@ e_select_names_completion_start_query (ESelectNamesCompletion *comp, const gchar sexp = book_query_sexp (comp); if (sexp && *sexp) { GList *l; + gboolean async = FALSE; if (out) fprintf (out, "\n\n**** starting query: \"%s\"\n", comp->priv->query_text); @@ -961,6 +962,7 @@ e_select_names_completion_start_query (ESelectNamesCompletion *comp, const gchar book_query_process_card_list (comp, book_data->cached_cards); } else { + async = TRUE; e_select_names_completion_clear_cache (book_data); book_data->cached_query_text = g_strdup (query_text); @@ -975,6 +977,12 @@ e_select_names_completion_start_query (ESelectNamesCompletion *comp, const gchar fprintf (out, "]\n"); } + /* if we looped through all the books + and were able to complete based + solely on our cached cards, signal + that the search is over. */ + if (!async) + e_completion_end_search (E_COMPLETION (comp)); } else { g_free (comp->priv->query_text); comp->priv->query_text = NULL; -- cgit v1.2.3