aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-12-14 12:11:37 +0800
committerChris Lahey <clahey@src.gnome.org>2000-12-14 12:11:37 +0800
commit166e630ba2ee632ef8ca9a7818601097841294bd (patch)
tree7fbcc1f709aecdc8c181b76edd6705d4dd22d48b
parenta918af2dc304d7584ccf973580a1672e54f3e87c (diff)
downloadgsoc2013-evolution-166e630ba2ee632ef8ca9a7818601097841294bd.tar
gsoc2013-evolution-166e630ba2ee632ef8ca9a7818601097841294bd.tar.gz
gsoc2013-evolution-166e630ba2ee632ef8ca9a7818601097841294bd.tar.bz2
gsoc2013-evolution-166e630ba2ee632ef8ca9a7818601097841294bd.tar.lz
gsoc2013-evolution-166e630ba2ee632ef8ca9a7818601097841294bd.tar.xz
gsoc2013-evolution-166e630ba2ee632ef8ca9a7818601097841294bd.tar.zst
gsoc2013-evolution-166e630ba2ee632ef8ca9a7818601097841294bd.zip
Test for the existance of LDAP_NAME_ERROR and if it exists as a macro, use
2000-12-13 Christopher James Lahey <clahey@helixcode.com> * 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
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/backend/pas/pas-backend-ldap.c4
2 files changed, 10 insertions, 0 deletions
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 <clahey@helixcode.com>
+
+ * 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 <michael@helixcode.com>
* 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;