diff options
| author | Chris Toshok <toshok@ximian.com> | 2002-05-21 05:56:58 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2002-05-21 05:56:58 +0800 |
| commit | 9b2e9f2b20d848c3bb884f3d7203d1eef72ca8c9 (patch) | |
| tree | bbc38d1377e005a67ed2ab902883049f9967490f | |
| parent | 4939e31d9370d63e673824100c2b62f74a7d2324 (diff) | |
| download | gsoc2013-evolution-9b2e9f2b20d848c3bb884f3d7203d1eef72ca8c9.tar.gz gsoc2013-evolution-9b2e9f2b20d848c3bb884f3d7203d1eef72ca8c9.tar.zst gsoc2013-evolution-9b2e9f2b20d848c3bb884f3d7203d1eef72ca8c9.zip | |
make sure we map status -> string correctly (add missing strings).
2002-05-17 Chris Toshok <toshok@ximian.com>
* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
make sure we map status -> string correctly (add missing strings).
* backend/ebook/e-book-types.h (EBookStatus): add the missing
AUTHENTICATION_REQUIRED status code, to map to the idl response.
* backend/ebook/e-book-listener.c
(e_book_listener_convert_status): make sure we map all idl status
codes to EBookStatus statuses.
svn path=/trunk/; revision=16958
| -rw-r--r-- | addressbook/ChangeLog | 12 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-listener.c | 6 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-types.h | 1 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-util.c | 3 |
4 files changed, 20 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 2cb1d58305..fc4c953f7d 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,15 @@ +2002-05-17 Chris Toshok <toshok@ximian.com> + + * gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog): + make sure we map status -> string correctly (add missing strings). + + * backend/ebook/e-book-types.h (EBookStatus): add the missing + AUTHENTICATION_REQUIRED status code, to map to the idl response. + + * backend/ebook/e-book-listener.c + (e_book_listener_convert_status): make sure we map all idl status + codes to EBookStatus statuses. + 2002-05-20 Ettore Perazzoli <ettore@ximian.com> * gui/component/addressbook-storage.c (load_source_data): Pass diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c index ce85ed75ba..99875c6c48 100644 --- a/addressbook/backend/ebook/e-book-listener.c +++ b/addressbook/backend/ebook/e-book-listener.c @@ -620,8 +620,6 @@ e_book_listener_convert_status (const GNOME_Evolution_Addressbook_BookListener_C return E_BOOK_STATUS_SUCCESS; case GNOME_Evolution_Addressbook_BookListener_RepositoryOffline: return E_BOOK_STATUS_REPOSITORY_OFFLINE; - case GNOME_Evolution_Addressbook_BookListener_AuthenticationFailed: - return E_BOOK_STATUS_AUTHENTICATION_FAILED; case GNOME_Evolution_Addressbook_BookListener_PermissionDenied: return E_BOOK_STATUS_PERMISSION_DENIED; case GNOME_Evolution_Addressbook_BookListener_CardNotFound: @@ -630,6 +628,10 @@ e_book_listener_convert_status (const GNOME_Evolution_Addressbook_BookListener_C return E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS; case GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported: return E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED; + case GNOME_Evolution_Addressbook_BookListener_AuthenticationFailed: + return E_BOOK_STATUS_AUTHENTICATION_FAILED; + case GNOME_Evolution_Addressbook_BookListener_AuthenticationRequired: + return E_BOOK_STATUS_AUTHENTICATION_REQUIRED; case GNOME_Evolution_Addressbook_BookListener_TLSNotAvailable: return E_BOOK_STATUS_TLS_NOT_AVAILABLE; case GNOME_Evolution_Addressbook_BookListener_OtherError: diff --git a/addressbook/backend/ebook/e-book-types.h b/addressbook/backend/ebook/e-book-types.h index 398e46d74c..05c28b6ea8 100644 --- a/addressbook/backend/ebook/e-book-types.h +++ b/addressbook/backend/ebook/e-book-types.h @@ -26,6 +26,7 @@ typedef enum { E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED, E_BOOK_STATUS_CANCELLED, E_BOOK_STATUS_AUTHENTICATION_FAILED, + E_BOOK_STATUS_AUTHENTICATION_REQUIRED, E_BOOK_STATUS_TLS_NOT_AVAILABLE, E_BOOK_STATUS_OTHER_ERROR } EBookStatus; diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c index b1c40bd483..f0f0e8dfe6 100644 --- a/addressbook/gui/widgets/e-addressbook-util.c +++ b/addressbook/gui/widgets/e-addressbook-util.c @@ -40,6 +40,9 @@ e_addressbook_error_dialog (const gchar *msg, EBookStatus status) N_("Card ID already exists"), N_("Protocol not supported"), N_("Cancelled"), + N_("Authentication Failed"), + N_("Authentication Required"), + N_("TLS not Available"), N_("Other error") }; char *error_msg; |