From 2af8159df56550e60a46f58e8d84eb528f015c22 Mon Sep 17 00:00:00 2001 From: Parthasarathi Susarla Date: Fri, 28 Jan 2005 19:29:55 +0000 Subject: call the eab_merging_* functions instead of e_book_sync* directly. The 2004-01-29 Parthasarathi Susarla * 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 Fixes bug #57819 svn path=/trunk/; revision=28604 --- addressbook/ChangeLog | 11 +++++++++++ addressbook/gui/contact-list-editor/e-contact-list-editor.c | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index b42c65733e..6e221ba118 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,14 @@ +2004-01-29 Parthasarathi Susarla + + * 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 + + Fixes bug #57819 + 2005-01-29 Sivaiah Nallagatla * gui/contact-editor/e-contact-editor.c diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 3915dde094..7cbf1d8dff 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -48,6 +48,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); @@ -413,9 +414,9 @@ save_contact (EContactListEditor *cle, gboolean should_close) cle->in_async_call = TRUE; if (cle->is_new_list) - e_book_async_add_contact (cle->book, cle->contact, (EBookIdCallback)list_added_cb, ecs); + eab_merging_book_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); + eab_merging_book_commit_contact (cle->book, cle->contact, (EBookCallback)list_modified_cb, ecs); cle->changed = FALSE; } -- cgit