diff options
| author | Chris Toshok <toshok@ximian.com> | 2002-03-10 09:57:47 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2002-03-10 09:57:47 +0800 |
| commit | 9ccdadd473a220eac94f67ff94d52ab9893e00b7 (patch) | |
| tree | 6b1902a2fe7cc4e111c24c667080e82df85169e7 /addressbook/backend/ebook | |
| parent | b6d54c7762636036e6b9173ef8c40befd5ddd1d8 (diff) | |
| download | gsoc2013-evolution-9ccdadd473a220eac94f67ff94d52ab9893e00b7.tar.gz gsoc2013-evolution-9ccdadd473a220eac94f67ff94d52ab9893e00b7.tar.zst gsoc2013-evolution-9ccdadd473a220eac94f67ff94d52ab9893e00b7.zip | |
add TLSNotAvailable to BookLister_CallStatus.
2002-03-09 Chris Toshok <toshok@ximian.com>
* backend/idl/addressbook.idl: add TLSNotAvailable to
BookLister_CallStatus.
* backend/ebook/e-book-types.h: add TLS_NOT_AVAILABLE to the EBookStatus enum.
* backend/ebook/e-book-listener.c
(e_book_listener_convert_status): add TLS_NOT_AVAILABLE to the
switch.
* backend/pas/pas-backend-ldap.c
(pas_backend_ldap_get_static_capabilities): fix name.
(pas_backend_ldap_class_init): fix name.
(pas_backend_ldap_connect): change return type to CallStatus so we
can return different errors from here. Also, do STARTTLS if the
user has asked for it and the connection supports it, returning
TLSNotAvailable (and close the connection) if they chose to
require it.
(pas_backend_ldap_load_uri): return pas_backend_ldap_connect.
(func_beginswith): pull in change from evolution-1-0-branch to
make full_name beginswith search both cn and sn.
svn path=/trunk/; revision=16005
Diffstat (limited to 'addressbook/backend/ebook')
| -rw-r--r-- | addressbook/backend/ebook/e-book-listener.c | 2 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-types.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c index 139eb849fa..ce85ed75ba 100644 --- a/addressbook/backend/ebook/e-book-listener.c +++ b/addressbook/backend/ebook/e-book-listener.c @@ -630,6 +630,8 @@ 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_TLSNotAvailable: + return E_BOOK_STATUS_TLS_NOT_AVAILABLE; case GNOME_Evolution_Addressbook_BookListener_OtherError: return E_BOOK_STATUS_OTHER_ERROR; default: diff --git a/addressbook/backend/ebook/e-book-types.h b/addressbook/backend/ebook/e-book-types.h index 9ce3323bdf..398e46d74c 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_TLS_NOT_AVAILABLE, E_BOOK_STATUS_OTHER_ERROR } EBookStatus; |