From 2dfabd3909d4afe12637160863884ea2c953cfac Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Sun, 1 Aug 2010 11:36:45 +0100 Subject: addressbook: Port to use new _async suffix instead of _ex suffix --- addressbook/gui/contact-editor/e-contact-editor.c | 32 ++++++++--------- .../contact-list-editor/e-contact-list-editor.c | 6 ++-- addressbook/gui/merging/eab-contact-compare.c | 6 ++-- addressbook/gui/merging/eab-contact-merging.c | 40 +++++++++++----------- addressbook/gui/merging/eab-contact-merging.h | 24 ++++++------- addressbook/gui/widgets/e-addressbook-model.c | 4 +-- addressbook/gui/widgets/e-addressbook-selector.c | 8 ++--- addressbook/gui/widgets/e-addressbook-view.c | 16 ++++----- addressbook/gui/widgets/e-minicard-view.c | 12 +++---- addressbook/gui/widgets/e-minicard-view.h | 2 +- addressbook/util/addressbook.c | 20 +++++------ addressbook/util/addressbook.h | 4 +-- addressbook/util/eab-book-util.c | 20 +++++------ addressbook/util/eab-book-util.h | 10 +++--- mail/Makefile.am | 1 + mail/em-utils.c | 2 +- modules/addressbook/e-book-shell-backend.c | 4 +-- 17 files changed, 106 insertions(+), 105 deletions(-) diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 9700cf9cf8..c7388ea3e8 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2747,7 +2747,7 @@ source_changed (ESourceComboBox *source_combo_box, EContactEditor *editor) editor->load_book = e_book_new (source, NULL); editor->load_source_id = addressbook_load (editor->load_book, - (EBookExCallback) new_target_cb, editor); + (EBookAsyncCallback) new_target_cb, editor); } static void @@ -3066,8 +3066,8 @@ contact_added_cb (EBook *book, const GError *error, const gchar *id, EditorClose if (ce->source_book != ce->target_book && e_book_is_writable (ce->source_book) && !error && ce->is_new_contact == FALSE) { ecs->new_id = g_strdup (id); - e_book_async_remove_contact_ex (ce->source_book, ce->contact, - (EBookExCallback) contact_moved_cb, ecs); + e_book_remove_contact_async (ce->source_book, ce->contact, + (EBookAsyncCallback) contact_moved_cb, ecs); return; } @@ -3137,14 +3137,14 @@ real_save_contact (EContactEditor *ce, gboolean should_close) if (ce->source_book != ce->target_book) { /* Two-step move; add to target, then remove from source */ eab_merging_book_add_contact (ce->target_book, ce->contact, - (EBookIdExCallback) contact_added_cb, ecs); + (EBookIdAsyncCallback) contact_added_cb, ecs); } else { if (ce->is_new_contact) eab_merging_book_add_contact (ce->target_book, ce->contact, - (EBookIdExCallback) contact_added_cb, ecs); + (EBookIdAsyncCallback) contact_added_cb, ecs); else eab_merging_book_commit_contact (ce->target_book, ce->contact, - (EBookExCallback) contact_modified_cb, ecs); + (EBookAsyncCallback) contact_modified_cb, ecs); } } @@ -3697,8 +3697,8 @@ e_contact_editor_new (EShell *shell, NULL); if (book) - e_book_async_get_supported_fields_ex ( - book, (EBookEListExCallback)supported_fields_cb, editor); + e_book_get_supported_fields_async ( + book, (EBookEListAsyncCallback)supported_fields_cb, editor); return editor; } @@ -3751,10 +3751,10 @@ e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *val editor->target_editable_id = g_signal_connect (editor->target_book, "writable_status", G_CALLBACK (writable_changed), editor); - e_book_async_get_supported_fields_ex (editor->target_book, - (EBookEListExCallback) supported_fields_cb, editor); - e_book_async_get_required_fields_ex (editor->target_book, - (EBookEListExCallback) required_fields_cb, editor); + e_book_get_supported_fields_async (editor->target_book, + (EBookEListAsyncCallback) supported_fields_cb, editor); + e_book_get_required_fields_async (editor->target_book, + (EBookEListAsyncCallback) required_fields_cb, editor); } writable = e_book_is_writable (editor->target_book); @@ -3790,11 +3790,11 @@ e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *val editor->target_editable_id = g_signal_connect (editor->target_book, "writable_status", G_CALLBACK (writable_changed), editor); - e_book_async_get_supported_fields_ex (editor->target_book, - (EBookEListExCallback) supported_fields_cb, editor); + e_book_get_supported_fields_async (editor->target_book, + (EBookEListAsyncCallback) supported_fields_cb, editor); - e_book_async_get_required_fields_ex (editor->target_book, - (EBookEListExCallback) required_fields_cb, editor); + e_book_get_required_fields_async (editor->target_book, + (EBookEListAsyncCallback) required_fields_cb, editor); if (!editor->is_new_contact) editor->changed = TRUE; 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 7453489f0a..52c15ea8e0 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -818,7 +818,7 @@ contact_list_editor_source_menu_changed_cb (GtkWidget *widget) editor->priv->load_book = e_book_new (source, NULL); editor->priv->load_source_id = addressbook_load ( - editor->priv->load_book, (EBookExCallback) + editor->priv->load_book, (EBookAsyncCallback) contact_list_editor_book_loaded, editor); } @@ -1115,11 +1115,11 @@ contact_list_editor_save_contact (EABEditor *eab_editor, if (priv->is_new_list) eab_merging_book_add_contact ( - priv->book, contact, (EBookIdExCallback) + priv->book, contact, (EBookIdAsyncCallback) contact_list_editor_list_added_cb, ecs); else eab_merging_book_commit_contact ( - priv->book, contact, (EBookExCallback) + priv->book, contact, (EBookAsyncCallback) contact_list_editor_list_modified_cb, ecs); priv->changed = FALSE; 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 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); diff --git a/addressbook/util/addressbook.c b/addressbook/util/addressbook.c index 10ec1a5b26..077e629f6e 100644 --- a/addressbook/util/addressbook.c +++ b/addressbook/util/addressbook.c @@ -37,11 +37,11 @@ #define d(x) static void addressbook_authenticate (EBook *book, gboolean previous_failure, - ESource *source, EBookExCallback cb, gpointer closure); + ESource *source, EBookAsyncCallback cb, gpointer closure); static void auth_required_cb (EBook *book, gpointer data); typedef struct { - EBookExCallback cb; + EBookAsyncCallback cb; ESource *source; gpointer closure; guint cancelled : 1; @@ -173,7 +173,7 @@ set_remember_password (ESource *source, gboolean value) static void addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *source, - EBookExCallback cb, gpointer closure) + EBookAsyncCallback cb, gpointer closure) { const gchar *password = NULL; gchar *pass_dup = NULL; @@ -236,9 +236,9 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc } if (password || pass_dup) { - e_book_async_authenticate_user_ex (book, user, password ? password : pass_dup, - e_source_get_property (source, "auth"), - cb, closure); + e_book_authenticate_user_async (book, user, password ? password : pass_dup, + e_source_get_property (source, "auth"), + cb, closure); g_free (pass_dup); } else { @@ -294,7 +294,7 @@ load_source_cb (EBook *book, const GError *error, gpointer closure) guint addressbook_load (EBook *book, - EBookExCallback cb, gpointer closure) + EBookAsyncCallback cb, gpointer closure) { LoadSourceData *load_source_data = g_new0 (LoadSourceData, 1); @@ -303,7 +303,7 @@ addressbook_load (EBook *book, load_source_data->source = g_object_ref (g_object_ref (e_book_get_source (book))); load_source_data->cancelled = FALSE; - e_book_async_open_ex (book, FALSE, load_source_cb, load_source_data); + e_book_open_async (book, FALSE, load_source_cb, load_source_data); return GPOINTER_TO_UINT (load_source_data); } @@ -328,7 +328,7 @@ default_book_cb (EBook *book, const GError *error, gpointer closure) } void -addressbook_load_default_book (EBookExCallback cb, gpointer closure) +addressbook_load_default_book (EBookAsyncCallback cb, gpointer closure) { LoadSourceData *load_source_data = g_new (LoadSourceData, 1); EBook *book; @@ -344,6 +344,6 @@ addressbook_load_default_book (EBookExCallback cb, gpointer closure) load_source_cb (NULL, error, load_source_data); g_error_free (error); } else - e_book_async_open_ex ( + e_book_open_async ( book, FALSE, default_book_cb, load_source_data); } diff --git a/addressbook/util/addressbook.h b/addressbook/util/addressbook.h index fca409ed8c..84163786d8 100644 --- a/addressbook/util/addressbook.h +++ b/addressbook/util/addressbook.h @@ -24,8 +24,8 @@ #include -guint addressbook_load (EBook *book, EBookExCallback cb, gpointer closure); +guint addressbook_load (EBook *book, EBookAsyncCallback cb, gpointer closure); void addressbook_load_cancel (guint id); -void addressbook_load_default_book (EBookExCallback open_response, gpointer closure); +void addressbook_load_default_book (EBookAsyncCallback open_response, gpointer closure); #endif /* __ADDRESSBOOK_H__ */ diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c index a1827d3cc9..3cd301bd70 100644 --- a/addressbook/util/eab-book-util.c +++ b/addressbook/util/eab-book-util.c @@ -55,11 +55,11 @@ escape (const gchar *str) } guint -eab_name_and_email_query (EBook *book, - const gchar *name, - const gchar *email, - EBookListExCallback cb, - gpointer closure) +eab_name_and_email_query (EBook *book, + const gchar *name, + const gchar *email, + EBookListAsyncCallback cb, + gpointer closure) { gchar *email_query=NULL, *name_query=NULL; EBookQuery *query; @@ -119,7 +119,7 @@ eab_name_and_email_query (EBook *book, else return 0; - tag = e_book_async_get_contacts_ex (book, query, cb, closure); + tag = e_book_get_contacts_async (book, query, cb, closure); g_free (email_query); g_free (name_query); @@ -134,10 +134,10 @@ eab_name_and_email_query (EBook *book, * Simple nickname query */ guint -eab_nickname_query (EBook *book, +eab_nickname_query (EBook *book, const gchar *nickname, - EBookListExCallback cb, - gpointer closure) + EBookListAsyncCallback cb, + gpointer closure) { EBookQuery *query; gchar *query_string; @@ -154,7 +154,7 @@ eab_nickname_query (EBook *book, query = e_book_query_from_string (query_string); - retval = e_book_async_get_contacts_ex (book, query, cb, closure); + retval = e_book_get_contacts_async (book, query, cb, closure); g_free (query_string); e_book_query_unref (query); diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h index edc7c3ebe6..1cda93c102 100644 --- a/addressbook/util/eab-book-util.h +++ b/addressbook/util/eab-book-util.h @@ -32,13 +32,13 @@ typedef void (*EABHaveAddressCallback) (EBook *book, const gchar *addr, EContact /* Specialized Name/Email Queries */ guint eab_name_and_email_query (EBook *book, - const gchar *name, - const gchar *email, - EBookListExCallback cb, + const gchar *name, + const gchar *email, + EBookListAsyncCallback cb, gpointer closure); guint eab_nickname_query (EBook *book, - const gchar *nickname, - EBookListExCallback cb, + const gchar *nickname, + EBookListAsyncCallback cb, gpointer closure); GList *eab_contact_list_from_string (const gchar *str); diff --git a/mail/Makefile.am b/mail/Makefile.am index fd624e3b73..8738fda13d 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -185,6 +185,7 @@ libevolution_mail_la_LIBADD = \ $(top_builddir)/widgets/table/libetable.la \ $(top_builddir)/widgets/text/libetext.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/em-format/libemformat.la \ diff --git a/mail/em-utils.c b/mail/em-utils.c index ae33087ad1..51bf58664e 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1600,7 +1600,7 @@ try_open_e_book (EBook *book, gboolean only_if_exists, GError **error) data.flag = flag; data.result = FALSE; - if (!e_book_async_open_ex (book, only_if_exists, try_open_e_book_cb, &data)) { + if (!e_book_open_async (book, only_if_exists, try_open_e_book_cb, &data)) { e_flag_free (flag); g_clear_error (error); g_set_error (error, E_BOOK_ERROR, E_BOOK_ERROR_OTHER_ERROR, "Failed to call e_book_async_open_ex."); diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index 0ae5dfbe61..6f3861dad0 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -243,12 +243,12 @@ action_contact_new_cb (GtkAction *action, book = e_book_new_default_addressbook (NULL); if (strcmp (action_name, "contact-new") == 0) - e_book_async_open_ex ( + e_book_open_async ( book, FALSE, book_shell_backend_new_contact_cb, shell); if (strcmp (action_name, "contact-new-list") == 0) - e_book_async_open_ex ( + e_book_open_async ( book, FALSE, book_shell_backend_new_contact_list_cb, shell); } -- cgit v1.2.3