diff options
| author | Parthasarathi Susarla <sparthasarathi@novell.com> | 2005-01-29 03:29:55 +0800 |
|---|---|---|
| committer | Sivaiah Nallagatla <siva@src.gnome.org> | 2005-01-29 03:29:55 +0800 |
| commit | 2af8159df56550e60a46f58e8d84eb528f015c22 (patch) | |
| tree | 00797562daaa77561e2c17f1e2d81f1b2d57f12f | |
| parent | db9ecaacf2dbf3699c41fa0cbfcdc04439dd8f40 (diff) | |
| download | gsoc2013-evolution-2af8159df56550e60a46f58e8d84eb528f015c22.tar.gz gsoc2013-evolution-2af8159df56550e60a46f58e8d84eb528f015c22.tar.zst gsoc2013-evolution-2af8159df56550e60a46f58e8d84eb528f015c22.zip | |
call the eab_merging_* functions instead of e_book_sync* directly. The
2004-01-29 Parthasarathi Susarla <sparthasarathi@novell.com>
* 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
| -rw-r--r-- | addressbook/ChangeLog | 11 | ||||
| -rw-r--r-- | 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 <sparthasarathi@novell.com> + + * 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 <snallagatla@novell.com> * 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; } |