diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-07-09 20:29:51 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-07-09 20:29:51 +0800 |
| commit | 03d626856b294bc98919ac244e04e9b8821a681d (patch) | |
| tree | 62433e158f1791aa6b9222ecbe05d164c4703f6c /addressbook/gui/widgets/e-addressbook-selector.c | |
| parent | 6d4ce8571ff62a3e489999d2feeac1691e06c59a (diff) | |
| download | gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar.gz gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar.bz2 gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar.lz gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar.xz gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.tar.zst gsoc2013-evolution-03d626856b294bc98919ac244e04e9b8821a681d.zip | |
Bug #623204 - Be able to report detailed errors from backends
Diffstat (limited to 'addressbook/gui/widgets/e-addressbook-selector.c')
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-selector.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c index 690ad007ba..8ae7bc6bbb 100644 --- a/addressbook/gui/widgets/e-addressbook-selector.c +++ b/addressbook/gui/widgets/e-addressbook-selector.c @@ -102,7 +102,7 @@ merge_context_free (MergeContext *merge_context) static void addressbook_selector_removed_cb (EBook *book, - EBookStatus status, + const GError *error, MergeContext *merge_context) { merge_context->pending_removals--; @@ -118,16 +118,16 @@ addressbook_selector_removed_cb (EBook *book, static void addressbook_selector_merge_next_cb (EBook *book, - EBookStatus status, + const GError *error, const gchar *id, MergeContext *merge_context) { - if (merge_context->remove_from_source && status == E_BOOK_ERROR_OK) { + if (merge_context->remove_from_source && !error) { /* Remove previous contact from source. */ - e_book_async_remove_contact ( + e_book_async_remove_contact_ex ( merge_context->source_book, merge_context->current_contact, - (EBookCallback) addressbook_selector_removed_cb, + (EBookExCallback) addressbook_selector_removed_cb, merge_context); merge_context->pending_removals++; } @@ -139,7 +139,7 @@ addressbook_selector_merge_next_cb (EBook *book, eab_merging_book_add_contact ( merge_context->target_book, merge_context->current_contact, - (EBookIdCallback) addressbook_selector_merge_next_cb, + (EBookIdExCallback) addressbook_selector_merge_next_cb, merge_context); } else if (merge_context->pending_removals == 0) @@ -319,7 +319,7 @@ addressbook_selector_data_dropped (ESourceSelector *selector, eab_merging_book_add_contact ( target_book, merge_context->current_contact, - (EBookIdCallback) addressbook_selector_merge_next_cb, + (EBookIdExCallback) addressbook_selector_merge_next_cb, merge_context); return TRUE; |