diff options
author | Rob Bradford <rob@linux.intel.com> | 2010-08-01 18:36:45 +0800 |
---|---|---|
committer | Rob Bradford <rob@linux.intel.com> | 2010-08-02 20:27:24 +0800 |
commit | 2dfabd3909d4afe12637160863884ea2c953cfac (patch) | |
tree | 263123ff34965ed147c62639d95d6c04e0e8d930 /addressbook/gui/widgets | |
parent | 68341973d40b9ac5ffbc3f4132af0656194df13e (diff) | |
download | gsoc2013-evolution-2dfabd3909d4afe12637160863884ea2c953cfac.tar gsoc2013-evolution-2dfabd3909d4afe12637160863884ea2c953cfac.tar.gz gsoc2013-evolution-2dfabd3909d4afe12637160863884ea2c953cfac.tar.bz2 gsoc2013-evolution-2dfabd3909d4afe12637160863884ea2c953cfac.tar.lz gsoc2013-evolution-2dfabd3909d4afe12637160863884ea2c953cfac.tar.xz gsoc2013-evolution-2dfabd3909d4afe12637160863884ea2c953cfac.tar.zst gsoc2013-evolution-2dfabd3909d4afe12637160863884ea2c953cfac.zip |
addressbook: Port to use new _async suffix instead of _ex suffix
Diffstat (limited to 'addressbook/gui/widgets')
-rw-r--r-- | addressbook/gui/widgets/e-addressbook-model.c | 4 | ||||
-rw-r--r-- | addressbook/gui/widgets/e-addressbook-selector.c | 8 | ||||
-rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 16 | ||||
-rw-r--r-- | addressbook/gui/widgets/e-minicard-view.c | 12 | ||||
-rw-r--r-- | addressbook/gui/widgets/e-minicard-view.h | 2 |
5 files changed, 21 insertions, 21 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index b46068d3ae..7cb962827b 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -371,7 +371,7 @@ addressbook_model_idle_cb (EAddressbookModel *model) model->priv->first_get_view = FALSE; if (e_book_check_static_capability (model->priv->book, "do-initial-query")) { - e_book_async_get_book_view_ex ( + e_book_get_book_view_async ( model->priv->book, model->priv->query, NULL, limit, book_view_loaded, model); } else { @@ -383,7 +383,7 @@ addressbook_model_idle_cb (EAddressbookModel *model) signals[STOP_STATE_CHANGED], 0); } } else - e_book_async_get_book_view_ex ( + e_book_get_book_view_async ( model->priv->book, model->priv->query, NULL, limit, book_view_loaded, model); diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c index 8ae7bc6bbb..d746964364 100644 --- a/addressbook/gui/widgets/e-addressbook-selector.c +++ b/addressbook/gui/widgets/e-addressbook-selector.c @@ -124,10 +124,10 @@ addressbook_selector_merge_next_cb (EBook *book, { if (merge_context->remove_from_source && !error) { /* Remove previous contact from source. */ - e_book_async_remove_contact_ex ( + e_book_remove_contact_async ( merge_context->source_book, merge_context->current_contact, - (EBookExCallback) addressbook_selector_removed_cb, + (EBookAsyncCallback) 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, - (EBookIdExCallback) addressbook_selector_merge_next_cb, + (EBookIdAsyncCallback) 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, - (EBookIdExCallback) addressbook_selector_merge_next_cb, + (EBookIdAsyncCallback) addressbook_selector_merge_next_cb, merge_context); return TRUE; diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index ca767ecf92..810e56f7b5 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1400,10 +1400,10 @@ e_addressbook_view_delete_selection(EAddressbookView *view, gboolean is_delete) } /* Remove the cards all at once. */ - e_book_async_remove_contacts_ex (book, - ids, - delete_contacts_cb, - NULL); + e_book_remove_contacts_async (book, + ids, + delete_contacts_cb, + NULL); g_list_free (ids); } @@ -1411,10 +1411,10 @@ e_addressbook_view_delete_selection(EAddressbookView *view, gboolean is_delete) for (l=list;l;l=g_list_next(l)) { contact = l->data; /* Remove the card. */ - e_book_async_remove_contact_ex (book, - contact, - delete_contacts_cb, - NULL); + e_book_remove_contact_async (book, + contact, + delete_contacts_cb, + NULL); } } diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index ba9c1b5b26..5751cfc38f 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -456,7 +456,7 @@ e_minicard_view_selection_event (EReflow *reflow, typedef struct { EMinicardView *view; - EBookExCallback cb; + EBookAsyncCallback cb; gpointer closure; } ViewCbClosure; @@ -467,7 +467,7 @@ do_remove (gint i, gpointer user_data) EContact *contact; ViewCbClosure *viewcbclosure = user_data; EMinicardView *view = viewcbclosure->view; - EBookExCallback cb = viewcbclosure->cb; + EBookAsyncCallback cb = viewcbclosure->cb; gpointer closure = viewcbclosure->closure; g_object_get (view->adapter, @@ -476,7 +476,7 @@ do_remove (gint i, gpointer user_data) contact = e_addressbook_reflow_adapter_get_contact (view->adapter, i); - e_book_async_remove_contact_ex (book, contact, cb, closure); + e_book_remove_contact_async (book, contact, cb, closure); g_object_unref (contact); } @@ -623,9 +623,9 @@ e_minicard_view_get_type (void) } void -e_minicard_view_remove_selection(EMinicardView *view, - EBookExCallback cb, - gpointer closure) +e_minicard_view_remove_selection(EMinicardView *view, + EBookAsyncCallback cb, + gpointer closure) { ViewCbClosure viewcbclosure; viewcbclosure.view = view; diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index e8fc9fc21f..8b37ba6df5 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -85,7 +85,7 @@ struct _EMinicardViewClass GType e_minicard_view_get_type (void); void e_minicard_view_remove_selection (EMinicardView *view, - EBookExCallback cb, + EBookAsyncCallback cb, gpointer closure); void e_minicard_view_jump_to_letter (EMinicardView *view, gunichar letter); |