[evolution-patches] patch for #74255 (address book)

[Sivaiah Nallagatla <snallagatla novell com>]

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1929
diff -u -p -r1.1929 ChangeLog
--- ChangeLog	24 Mar 2005 08:30:24 -0000	1.1929
+++ ChangeLog	3 Apr 2005 09:47:07 -0000
@@ -1,3 +1,11 @@
+2005-04-03  Sivaiah Nallagatla <snallagatla novell com>
+
+	* gui/widgets/eab-gui-util.c (do_copy) :
+	use eab_merging_book_add_contact instead of 
+	e_book_async_add_contact to take care of duplicate
+	checking 
+	Fixes #74255
+
 2005-03-16  Li Yuan  <li yuan sun com>
 
 	* gui/widgets/gal-view-minicard.c: (gal_view_minicard_class_init):
Index: gui/widgets/eab-gui-util.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-gui-util.c,v
retrieving revision 1.33
diff -u -p -r1.33 eab-gui-util.c
--- gui/widgets/eab-gui-util.c	23 Dec 2004 18:04:56 -0000	1.33
+++ gui/widgets/eab-gui-util.c	3 Apr 2005 09:47:12 -0000
@@ -34,7 +34,7 @@
 #include "widgets/misc/e-error.h"
 #include "widgets/misc/e-image-chooser.h"
 #include <e-util/e-icon-factory.h>
-
+#include "eab-contact-merging.h"
 #include <gnome.h>
 
 #include "addressbook/gui/contact-editor/eab-editor.h"
@@ -666,7 +666,7 @@ do_copy (gpointer data, gpointer user_da
 	book = process->destination;
 
 	process->count ++;
-	e_book_async_add_contact(book, contact, contact_added_cb, process);
+	eab_merging_book_add_contact(book, contact, contact_added_cb, process);
 }
 
 static void