diff options
| author | Dan Winship <danw@src.gnome.org> | 2002-08-31 01:44:39 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2002-08-31 01:44:39 +0800 |
| commit | 531608c93b59be977f1a4ccd057c3c0f5f837cc4 (patch) | |
| tree | 243fd346324f6d6b892ed66d52fb727123684d90 | |
| parent | 915e52dbeb814508d272dd30ae1863f79c46fc4d (diff) | |
| download | gsoc2013-evolution-531608c93b59be977f1a4ccd057c3c0f5f837cc4.tar.gz gsoc2013-evolution-531608c93b59be977f1a4ccd057c3c0f5f837cc4.tar.zst gsoc2013-evolution-531608c93b59be977f1a4ccd057c3c0f5f837cc4.zip | |
add QueryRefused, for when the backend refuses to perform a query. (part
* backend/idl/addressbook.idl (CallStatus): add QueryRefused, for
when the backend refuses to perform a query. (part of #25782)
* backend/ebook/e-book-view-listener.c
(e_book_view_listener_convert_status): translate
GNOME_Evolution_Addressbook_BookViewListener_QueryRefused.
* gui/component/addressbook.c (search_result): Handle
E_BOOK_VIEW_STATUS_QUERY_REFUSED.
svn path=/trunk/; revision=17934
| -rw-r--r-- | addressbook/ChangeLog | 12 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-types.h | 1 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-view-listener.c | 2 | ||||
| -rw-r--r-- | addressbook/backend/idl/addressbook.idl | 1 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 3 |
5 files changed, 19 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 80b19e186c..c508173bda 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,15 @@ +2002-08-30 Dan Winship <danw@ximian.com> + + * backend/idl/addressbook.idl (CallStatus): add QueryRefused, for + when the backend refuses to perform a query. (part of #25782) + + * backend/ebook/e-book-view-listener.c + (e_book_view_listener_convert_status): translate + GNOME_Evolution_Addressbook_BookViewListener_QueryRefused. + + * gui/component/addressbook.c (search_result): Handle + E_BOOK_VIEW_STATUS_QUERY_REFUSED. + 2002-08-30 Chris Toshok <toshok@ximian.com> [ fixes #27923] diff --git a/addressbook/backend/ebook/e-book-types.h b/addressbook/backend/ebook/e-book-types.h index 59459a0979..eb70a778fc 100644 --- a/addressbook/backend/ebook/e-book-types.h +++ b/addressbook/backend/ebook/e-book-types.h @@ -37,6 +37,7 @@ typedef enum { E_BOOK_VIEW_STATUS_TIME_LIMIT_EXCEEDED, E_BOOK_VIEW_STATUS_SIZE_LIMIT_EXCEEDED, E_BOOK_VIEW_STATUS_INVALID_QUERY, + E_BOOK_VIEW_STATUS_QUERY_REFUSED, E_BOOK_VIEW_STATUS_OTHER_ERROR, E_BOOK_VIEW_STATUS_UNKNOWN } EBookViewStatus; diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c index cbb548892f..ce46fd1100 100644 --- a/addressbook/backend/ebook/e-book-view-listener.c +++ b/addressbook/backend/ebook/e-book-view-listener.c @@ -315,6 +315,8 @@ e_book_view_listener_convert_status (const GNOME_Evolution_Addressbook_BookViewL return E_BOOK_VIEW_STATUS_SIZE_LIMIT_EXCEEDED; case GNOME_Evolution_Addressbook_BookViewListener_InvalidQuery: return E_BOOK_VIEW_STATUS_INVALID_QUERY; + case GNOME_Evolution_Addressbook_BookViewListener_QueryRefused: + return E_BOOK_VIEW_STATUS_QUERY_REFUSED; case GNOME_Evolution_Addressbook_BookViewListener_OtherError: return E_BOOK_VIEW_STATUS_OTHER_ERROR; default: diff --git a/addressbook/backend/idl/addressbook.idl b/addressbook/backend/idl/addressbook.idl index 8872c07c94..18a60f074f 100644 --- a/addressbook/backend/idl/addressbook.idl +++ b/addressbook/backend/idl/addressbook.idl @@ -40,6 +40,7 @@ module Addressbook { /* These are failures */ InvalidQuery, + QueryRefused, OtherError }; void notifyCardAdded (in VCardList cards); diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 4a40762a91..74e21bbf47 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -926,6 +926,9 @@ search_result (EAddressbookView *eav, EBookViewStatus status, AddressbookView *v 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_QUERY_REFUSED: + str = _("The backend for this addressbook refused to perform this query."); + break; case E_BOOK_VIEW_STATUS_OTHER_ERROR: case E_BOOK_VIEW_STATUS_UNKNOWN: str = _("This query did not complete successfully."); |