diff options
Diffstat (limited to 'addressbook/gui/component')
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 38 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names-completion.c | 4 |
2 files changed, 40 insertions, 2 deletions
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index bf4de3db4d..025ac334db 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -906,6 +906,39 @@ set_status_message (EAddressbookView *eav, const char *message, AddressbookView } static void +search_result (EAddressbookView *eav, EBookViewStatus status, AddressbookView *view) +{ + char *str = NULL; + + switch (status) { + case E_BOOK_VIEW_STATUS_SUCCESS: + return; + case E_BOOK_VIEW_STATUS_SIZE_LIMIT_EXCEEDED: + str = _("More cards matched this query than either the server is \n" + "configured to return or Evolution is configured to display.\n" + "Please make your search more specific or raise the result limit in\n" + "the directory server preferences for this addressbook."); + break; + case E_BOOK_VIEW_STATUS_TIME_LIMIT_EXCEEDED: + str = _("The time to execute this query exceeded the server limit or the limit\n" + "you have configured for this addressbook. Please make your search\n" + "more specific or raise the time limit in the directory server\n" + "preferences for this addressbook."); + break; + case E_BOOK_VIEW_STATUS_INVALID_QUERY: + str = _("The backend for this addressbook was unable to parse this query."); + break; + case E_BOOK_VIEW_STATUS_OTHER_ERROR: + case E_BOOK_VIEW_STATUS_UNKNOWN: + str = _("This query did not complete successfully."); + break; + } + + if (str) + gnome_warning_dialog (str); +} + +static void set_folder_bar_label (EAddressbookView *eav, const char *message, AddressbookView *view) { CORBA_Environment ev; @@ -1065,6 +1098,11 @@ addressbook_factory_new_control (void) view); gtk_signal_connect (GTK_OBJECT (view->view), + "search_result", + GTK_SIGNAL_FUNC(search_result), + view); + + gtk_signal_connect (GTK_OBJECT (view->view), "folder_bar_message", GTK_SIGNAL_FUNC(set_folder_bar_label), view); 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 42b62c1832..c2ff6f9640 100644 --- a/addressbook/gui/component/select-names/e-select-names-completion.c +++ b/addressbook/gui/component/select-names/e-select-names-completion.c @@ -81,7 +81,7 @@ static void e_select_names_completion_destroy (GtkObject *object); static void e_select_names_completion_got_book_view_cb (EBook *book, EBookStatus status, EBookView *view, gpointer user_data); static void e_select_names_completion_card_added_cb (EBookView *, const GList *cards, gpointer user_data); -static void e_select_names_completion_seq_complete_cb (EBookView *, gpointer user_data); +static void e_select_names_completion_seq_complete_cb (EBookView *, EBookViewStatus status, gpointer user_data); static void e_select_names_completion_do_query (ESelectNamesCompletion *, const gchar *query_text, gint pos, gint limit); @@ -884,7 +884,7 @@ e_select_names_completion_card_added_cb (EBookView *book_view, const GList *card } static void -e_select_names_completion_seq_complete_cb (EBookView *book_view, gpointer user_data) +e_select_names_completion_seq_complete_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data) { ESelectNamesCompletionBookData *book_data = user_data; ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION(book_data->comp); |