diff options
Diffstat (limited to 'addressbook/backend')
| -rw-r--r-- | addressbook/backend/ebook/e-book-listener.c | 2 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-types.h | 1 | ||||
| -rw-r--r-- | addressbook/backend/idl/addressbook.idl | 1 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-ldap.c | 8 |
4 files changed, 6 insertions, 6 deletions
diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c index f9d4f67f97..b483d10d87 100644 --- a/addressbook/backend/ebook/e-book-listener.c +++ b/addressbook/backend/ebook/e-book-listener.c @@ -480,6 +480,8 @@ e_book_listener_convert_status (const GNOME_Evolution_Addressbook_BookListener_C return E_BOOK_STATUS_PERMISSION_DENIED; case GNOME_Evolution_Addressbook_BookListener_CardNotFound: return E_BOOK_STATUS_CARD_NOT_FOUND; + case GNOME_Evolution_Addressbook_BookListener_CardIdAlreadyExists: + 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_OtherError: diff --git a/addressbook/backend/ebook/e-book-types.h b/addressbook/backend/ebook/e-book-types.h index d7eee35ede..d6d69b4b20 100644 --- a/addressbook/backend/ebook/e-book-types.h +++ b/addressbook/backend/ebook/e-book-types.h @@ -22,6 +22,7 @@ typedef enum { E_BOOK_STATUS_REPOSITORY_OFFLINE, E_BOOK_STATUS_PERMISSION_DENIED, E_BOOK_STATUS_CARD_NOT_FOUND, + E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS, E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED, E_BOOK_STATUS_CANCELLED, E_BOOK_STATUS_OTHER_ERROR diff --git a/addressbook/backend/idl/addressbook.idl b/addressbook/backend/idl/addressbook.idl index 877813e5d3..583824bba2 100644 --- a/addressbook/backend/idl/addressbook.idl +++ b/addressbook/backend/idl/addressbook.idl @@ -105,6 +105,7 @@ module Addressbook { RepositoryOffline, PermissionDenied, CardNotFound, + CardIdAlreadyExists, ProtocolNotSupported, AuthenticationFailed, AuthenticationRequired, diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c index ae683594c5..9562441181 100644 --- a/addressbook/backend/pas/pas-backend-ldap.c +++ b/addressbook/backend/pas/pas-backend-ldap.c @@ -29,12 +29,6 @@ #define OPENLDAP1 #endif -#if 0 -#ifdef OPENLDAP1 -#define LDAP_NAME_ERROR(x) NAME_ERROR(x) -#endif -#endif - #ifdef OPENLDAP2 #include "ldap_schema.h" #endif @@ -530,6 +524,8 @@ ldap_error_to_response (int ldap_error) return GNOME_Evolution_Addressbook_BookListener_PermissionDenied; else if (ldap_error == LDAP_SERVER_DOWN) return GNOME_Evolution_Addressbook_BookListener_RepositoryOffline; + else if (ldap_error == LDAP_ALREADY_EXISTS) + return GNOME_Evolution_Addressbook_BookListener_CardIdAlreadyExists; else return GNOME_Evolution_Addressbook_BookListener_OtherError; } |