From 166e630ba2ee632ef8ca9a7818601097841294bd Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Thu, 14 Dec 2000 04:11:37 +0000 Subject: Test for the existance of LDAP_NAME_ERROR and if it exists as a macro, use 2000-12-13 Christopher James Lahey * backend/pas/pas-backend-ldap.c (ldap_error_to_response): Test for the existance of LDAP_NAME_ERROR and if it exists as a macro, use it instead of NAME_ERROR. svn path=/trunk/; revision=6992 --- addressbook/ChangeLog | 6 ++++++ addressbook/backend/pas/pas-backend-ldap.c | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'addressbook') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 1dfb557500..036ba2cd7e 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2000-12-13 Christopher James Lahey + + * backend/pas/pas-backend-ldap.c (ldap_error_to_response): Test + for the existance of LDAP_NAME_ERROR and if it exists as a macro, + use it instead of NAME_ERROR. + 2000-12-14 Michael Meeks * gui/component/GNOME_Evolution_Addressbook.oafinfo: update cut diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c index 22e37b3841..5c7be3335a 100644 --- a/addressbook/backend/pas/pas-backend-ldap.c +++ b/addressbook/backend/pas/pas-backend-ldap.c @@ -330,7 +330,11 @@ ldap_error_to_response (int ldap_error) { if (ldap_error == LDAP_SUCCESS) return GNOME_Evolution_Addressbook_BookListener_Success; +#ifdef LDAP_NAME_ERROR + else if (LDAP_NAME_ERROR (ldap_error)) +#else else if (NAME_ERROR (ldap_error)) +#endif return GNOME_Evolution_Addressbook_BookListener_CardNotFound; else if (ldap_error == LDAP_INSUFFICIENT_ACCESS) return GNOME_Evolution_Addressbook_BookListener_PermissionDenied; -- cgit v1.2.3