Merge lp:~rodrigo-moya/evolution-couchdb/0-3-2-delete-multiple-contacts into lp:~ubuntu-desktop/evolution-couchdb/ubuntu

[Rodrigo Moya]

[Rodrigo Moya (rodrigo-moya)]

Added upstream patch to allow removal of multiple contacts at once

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-12 12:38:04 +0000
+++ debian/changelog	2009-10-22 13:55:18 +0000
@@ -1,3 +1,10 @@
+evolution-couchdb (0.3.2-0ubuntu2) karmic; urgency=low
+
+  * Added upstream patch for allowing removal of multiple contacts at once
+    (LP: #456024)
+
+ -- Rodrigo Moya <[e-mail]>  Thu, 22 Oct 2009 13:19:38 +0200
+
 evolution-couchdb (0.3.2-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release:

=== added file 'debian/patches/02_delete_multiple_contacts.patch'
--- debian/patches/02_delete_multiple_contacts.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_delete_multiple_contacts.patch	2009-10-22 13:55:18 +0000
@@ -0,0 +1,37 @@
+commit 3420a1b23316371922bca9287beb454b09be542f
+Author: Rodrigo Moya <[e-mail]>
+Date:   Tue Oct 20 17:44:08 2009 +0200
+
+    Get the UID from the iterated list item, not from the head of the list, which tries to delete all the time the first ID
+
+diff --git a/addressbook/e-book-backend-couchdb.c b/addressbook/e-book-backend-couchdb.c
+index c8364b1..834df63 100644
+--- a/addressbook/e-book-backend-couchdb.c
++++ b/addressbook/e-book-backend-couchdb.c
+@@ -1083,12 +1083,25 @@ e_book_backend_couchdb_remove_contacts (EBookBackend *backend,
+ 	for (l = id_list; l != NULL; l = l->next) {
+ 		CouchDBDocument *document;
+ 		GError *error = NULL;
+-		const gchar *uid = (const gchar *) id_list->data;
++		const gchar *uid = (const gchar *) l->data;
+ 
+ 		document = couchdb_document_get (couchdb_backend->couchdb, couchdb_backend->dbname, uid, &error);
+ 		if (document) {
+ 			if (couchdb_document_delete (document, &error))
+ 				deleted_ids = g_list_append (deleted_ids, (gpointer) uid);
++			else {
++				if (error != NULL) {
++					g_debug ("Error deleting document: %s", error->message);
++					g_error_free (error);
++				} else
++					g_debug ("Error deleting document");
++			}
++		} else {
++			if (error != NULL) {
++				g_debug ("Error getting document: %s", error->message);
++				g_error_free (error);
++			} else
++				g_debug ("Error getting document");
+ 		}
+ 	}
+