[evolution-patches] Fix for bug # 57819

[Parthasarathi Susarla <sparthasarathi novell com>]

Hi all,
attached is the fix for bug # 57819. Have called
eab_merging_book_add_contact() instead of e_book_async_add_contact() and
eab_merging_book_commit_contact() instead of e_book_async_commit_contact
().

This would prompt a dialog box showing the duplicate contact. 

This fix might require a string change. Currently have not made any

regards,
partha

Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1816
diff -u -r1.1816 ChangeLog
--- addressbook/ChangeLog	21 Aug 2004 21:53:41 -0000	1.1816
+++ addressbook/ChangeLog	25 Aug 2004 07:07:02 -0000
@@ -1,3 +1,13 @@
+2004-08-25 Parthasarathi Susarla <sparthasarathi novell com>
+	Fixes bug #57819
+	* addressbook/gui/contact-list-editor/e-contact-list-editor.c
+	 (save_contact) : call the eab_merging_* functions instead of
+	 e_book_sync* directly. The merging function check for duplication. 
+	 The following functions have been called:
+	 1. eab_merging_book_add_contact for adding a new entry
+	 2. eab_merging_book_commit_contact for commiting a modified entry
+	
+
 2004-08-20  Chris Toshok  <toshok ximian com>
 
 	* gui/component/component-factory.c (factory): remove the dead
Index: addressbook/gui/contact-list-editor/e-contact-list-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/e-contact-list-editor.c,v
retrieving revision 1.63
diff -u -r1.63 e-contact-list-editor.c
--- addressbook/gui/contact-list-editor/e-contact-list-editor.c	3 Aug 2004 22:53:33 -0000	1.63
+++ addressbook/gui/contact-list-editor/e-contact-list-editor.c	25 Aug 2004 07:07:19 -0000
@@ -52,6 +52,7 @@
 #include "e-contact-editor.h"
 #include "e-contact-list-model.h"
 #include "e-contact-list-editor-marshal.h"
+#include "eab-contact-merging.h"
 
 static void e_contact_list_editor_init		(EContactListEditor		 *editor);
 static void e_contact_list_editor_class_init	(EContactListEditorClass	 *klass);
@@ -410,10 +411,10 @@
 			gtk_widget_set_sensitive (cle->app, FALSE);
 		cle->in_async_call = TRUE;
 
-		if (cle->is_new_list)
-			e_book_async_add_contact (cle->book, cle->contact, (EBookIdCallback)list_added_cb, ecs);
-		else
-			e_book_async_commit_contact (cle->book, cle->contact, (EBookCallback)list_modified_cb, ecs);
+		if (cle->is_new_list) 
+			eab_merging_book_add_contact(cle->book,cle->contact,(EBookIdCallback)list_added_cb,ecs) ;
+		else 
+			eab_merging_book_commit_contact(cle->book, cle->contact,(EBookIdCallback)list_modified_cb,ecs) ;
 
 		cle->changed = FALSE;
 	}