diff options
Diffstat (limited to 'addressbook/gui/merging')
-rw-r--r-- | addressbook/gui/merging/eab-contact-compare.c | 6 | ||||
-rw-r--r-- | addressbook/gui/merging/eab-contact-merging.c | 40 | ||||
-rw-r--r-- | addressbook/gui/merging/eab-contact-merging.h | 24 |
3 files changed, 35 insertions, 35 deletions
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c index aad7c52f89..bc686986e2 100644 --- a/addressbook/gui/merging/eab-contact-compare.c +++ b/addressbook/gui/merging/eab-contact-compare.c @@ -707,7 +707,7 @@ use_common_book_cb (EBook *book, const GError *error, gpointer closure) } if (query) - e_book_async_get_contacts_ex (book, query, query_cb, info); + e_book_get_contacts_async (book, query, query_cb, info); else query_cb (book, NULL, NULL, info); @@ -731,7 +731,7 @@ eab_contact_locate_match (EContact *contact, EABContactMatchQueryCallback cb, gp info->closure = closure; info->avoid = NULL; - addressbook_load_default_book ((EBookExCallback) use_common_book_cb, info); + addressbook_load_default_book ((EBookAsyncCallback) use_common_book_cb, info); } /** @@ -764,6 +764,6 @@ eab_contact_locate_match_full (EBook *book, EContact *contact, GList *avoid, EAB if (book) use_common_book_cb (book, NULL, info); else - addressbook_load_default_book ((EBookExCallback) use_common_book_cb, info); + addressbook_load_default_book ((EBookAsyncCallback) use_common_book_cb, info); } diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 70a1aa462b..ca21dee30b 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -49,9 +49,9 @@ typedef struct { /*match is the duplicate contact already existing in the addressbook*/ EContact *match; GList *avoid; - EBookIdExCallback id_cb; - EBookExCallback cb; - EBookContactExCallback c_cb; + EBookIdAsyncCallback id_cb; + EBookAsyncCallback cb; + EBookContactAsyncCallback c_cb; gpointer closure; } EContactMergingLookup; @@ -153,11 +153,11 @@ doit (EContactMergingLookup *lookup, gboolean force_commit) { if (lookup->op == E_CONTACT_MERGING_ADD) { if (force_commit) - e_book_async_commit_contact_ex (lookup->book, lookup->contact, final_cb_as_id, lookup); + e_book_commit_contact_async (lookup->book, lookup->contact, final_cb_as_id, lookup); else - e_book_async_add_contact_ex (lookup->book, lookup->contact, final_id_cb, lookup); + e_book_add_contact_async (lookup->book, lookup->contact, final_id_cb, lookup); } else if (lookup->op == E_CONTACT_MERGING_COMMIT) - e_book_async_commit_contact_ex (lookup->book, lookup->contact, final_cb, lookup); + e_book_commit_contact_async (lookup->book, lookup->contact, final_cb, lookup); } static void @@ -375,8 +375,8 @@ mergeit (EContactMergingLookup *lookup) { case GTK_RESPONSE_OK: lookup->contact = lookup->match; - e_book_async_remove_contact_ex (lookup->book, lookup->match, NULL, lookup); - e_book_async_add_contact_ex (lookup->book, lookup->contact, final_id_cb, lookup); + e_book_remove_contact_async (lookup->book, lookup->match, NULL, lookup); + e_book_add_contact_async (lookup->book, lookup->contact, final_id_cb, lookup); value = 1; break; case GTK_RESPONSE_CANCEL: @@ -545,10 +545,10 @@ match_query_callback (EContact *contact, EContact *match, EABContactMatchType ty } gboolean -eab_merging_book_add_contact (EBook *book, - EContact *contact, - EBookIdExCallback cb, - gpointer closure) +eab_merging_book_add_contact (EBook *book, + EContact *contact, + EBookIdAsyncCallback cb, + gpointer closure) { EContactMergingLookup *lookup; @@ -568,10 +568,10 @@ eab_merging_book_add_contact (EBook *book, } gboolean -eab_merging_book_commit_contact (EBook *book, - EContact *contact, - EBookExCallback cb, - gpointer closure) +eab_merging_book_commit_contact (EBook *book, + EContact *contact, + EBookAsyncCallback cb, + gpointer closure) { EContactMergingLookup *lookup; @@ -591,10 +591,10 @@ eab_merging_book_commit_contact (EBook *book, } gboolean -eab_merging_book_find_contact (EBook *book, - EContact *contact, - EBookContactExCallback cb, - gpointer closure) +eab_merging_book_find_contact (EBook *book, + EContact *contact, + EBookContactAsyncCallback cb, + gpointer closure) { EContactMergingLookup *lookup; diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h index eacfcf734a..40d12a5a29 100644 --- a/addressbook/gui/merging/eab-contact-merging.h +++ b/addressbook/gui/merging/eab-contact-merging.h @@ -30,18 +30,18 @@ G_BEGIN_DECLS -gboolean eab_merging_book_add_contact (EBook *book, - EContact *contact, - EBookIdExCallback cb, - gpointer closure); -gboolean eab_merging_book_commit_contact (EBook *book, - EContact *contact, - EBookExCallback cb, - gpointer closure); -gboolean eab_merging_book_find_contact (EBook *book, - EContact *contact, - EBookContactExCallback cb, - gpointer closure); +gboolean eab_merging_book_add_contact (EBook *book, + EContact *contact, + EBookIdAsyncCallback cb, + gpointer closure); +gboolean eab_merging_book_commit_contact (EBook *book, + EContact *contact, + EBookAsyncCallback cb, + gpointer closure); +gboolean eab_merging_book_find_contact (EBook *book, + EContact *contact, + EBookContactAsyncCallback cb, + gpointer closure); G_END_DECLS |