[evolution-patches] [Addressbook] Fix for #336713

["simon.zheng" <Simon Zheng Sun COM>]

Hi,

Bug 336713 â?? Can't operate addressbooks again after double pasting more
than 20 contacts.
http://bugzilla.gnome.org/show_bug.cgi?id=336713

Sending a patch for review. Make sure finished_lookup() can be invoked
at the end of pasting contact.

Thank,
-Simon

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.2062
diff -u -p -r1.2062 ChangeLog
--- ChangeLog	6 Mar 2006 10:59:03 -0000	1.2062
+++ ChangeLog	31 Mar 2006 09:49:39 -0000
@@ -1,3 +1,10 @@
+2006-03-31  Simon Zheng  <simon zheng sun com>
+
+	Fix for Bug 336713
+	* gui/merging/eab-contact-merging.c: (cancelit): After selecting 
+	"cancel duplicate" when pasting contacts, can't remove those
+	EContactMergingLookup. Make finished_lookup() available. 
+
 2006-03-06  Devashish Sharma <sdevashish novell com>
 
 	* gui/contact-editor/e-contact-editor.c (fill_in_address_textview):
Index: gui/merging/eab-contact-merging.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/merging/eab-contact-merging.c,v
retrieving revision 1.7
diff -u -p -r1.7 eab-contact-merging.c
--- gui/merging/eab-contact-merging.c	26 Nov 2005 01:51:38 -0000	1.7
+++ gui/merging/eab-contact-merging.c	31 Mar 2006 09:49:39 -0000
@@ -124,11 +124,9 @@ static void
 cancelit (EContactMergingLookup *lookup)
 {
 	if (lookup->op == E_CONTACT_MERGING_ADD) {
-		if (lookup->id_cb)
-			final_id_cb (lookup->book, E_BOOK_ERROR_CANCELLED, NULL, lookup);
+		final_id_cb (lookup->book, E_BOOK_ERROR_CANCELLED, NULL, lookup);
 	} else if (lookup->op == E_CONTACT_MERGING_COMMIT) {
-		if (lookup->cb)
-			final_cb (lookup->book, E_BOOK_ERROR_CANCELLED, lookup);
+		final_cb (lookup->book, E_BOOK_ERROR_CANCELLED, lookup);
 	}
 }