evolution-data-server r9459 - in trunk/addressbook: . backends/ldap

[msuman svn gnome org]

Author: msuman
Date: Mon Sep  1 03:57:33 2008
New Revision: 9459
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9459&view=rev

Log:
Milan Crha  <mcrha redhat com> ** Fix for bug #548827 (Handle also AuthenticationRequired error, do not report we removed any contact when received an error, report end of the operation properly).

Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/backends/ldap/e-book-backend-ldap.c

Modified: trunk/addressbook/backends/ldap/e-book-backend-ldap.c
==============================================================================
--- trunk/addressbook/backends/ldap/e-book-backend-ldap.c	(original)
+++ trunk/addressbook/backends/ldap/e-book-backend-ldap.c	Mon Sep  1 03:57:33 2008
@@ -1145,6 +1145,8 @@
 		return GNOME_Evolution_Addressbook_ContactNotFound;
 	else if (ldap_error == LDAP_INSUFFICIENT_ACCESS)
 		return GNOME_Evolution_Addressbook_PermissionDenied;
+	else if (ldap_error == LDAP_STRONG_AUTH_REQUIRED)
+		return GNOME_Evolution_Addressbook_AuthenticationRequired;
 	else if (ldap_error == LDAP_SERVER_DOWN)
 		return GNOME_Evolution_Addressbook_RepositoryOffline;
 	else if (ldap_error == LDAP_ALREADY_EXISTS)
@@ -1693,8 +1695,9 @@
 	e_data_book_respond_remove_contacts (remove_op->op.book,
 					     op->opid,
 					     ldap_error_to_response (ldap_error),
-					     ids);
+					     ldap_error == LDAP_SUCCESS ? ids : NULL);
 	g_list_free (ids);
+	ldap_op_finished (op);
 }
 
 static void
@@ -1758,6 +1761,7 @@
 							     opid,
 							     ldap_error_to_response (ldap_error),
 							     NULL);
+			ldap_op_finished ((LDAPOp*)remove_op);
 			remove_contact_dtor ((LDAPOp*)remove_op);
 			return;
 		}