From 47c3838fee257737f17aae3696a8dda177af7a35 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Thu, 20 May 2004 01:16:30 +0000 Subject: use the new e_book_new and e_book_open apis. 2004-05-19 Chris Toshok * importers/evolution-vcard-importer.c (load_file_fn): use the new e_book_new and e_book_open apis. * importers/evolution-ldif-importer.c (load_file_fn): use the new e_book_new and e_book_open apis. * gui/widgets/eab-gui-util.c (eab_transfer_contacts): use the new e_book_new and e_book_async_open apis. * gui/contact-editor/e-contact-editor.c (cancel_load): addressbook_load_source_cancel -> addressbook_load_cancel. (source_selected): use the new e_book_new and addressbook_load. * gui/component/select-names/e-select-names.c (addressbook_model_set_source): use the new e_book_new and addressbook_load. * gui/component/select-names/e-select-names-manager.c (update_completion_books): use the new e_book_new and addressbook_load. * gui/component/addressbook.h: rename addressbook_load_source{_cancel} to addressbook_load{_cancel}, and remove the source arg. * gui/component/addressbook.c (addressbook_load): rename since we aren't passing a source anymore. (addressbook_load_cancel): same. (addressbook_load_default_book): use the new e_book_new_* apis. * gui/component/addressbook-view.c (delete_addressbook_cb): just use e_book_new, not e_book_load_source. (selector_tree_drag_data_received): switch to new e_book_new_*/e_book_open apis. (activate_source): same, and addressbook_load_source -> addressbook_load. * gui/component/addressbook-migrate.c (migrate_contact_folder_to_source): switch to new e_book_new_*/e_book_open apis. (migrate_contact_lists_for_local_folders): same. (migrate_company_phone_for_local_folders): same. * conduit/address-conduit.c (pre_sync): switch to new e_book_new_*/e_book_open apis. svn path=/trunk/; revision=25999 --- addressbook/gui/component/select-names/e-select-names-manager.c | 4 ++-- addressbook/gui/component/select-names/e-select-names.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/component/select-names') diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c index d78ac0aef6..43b69d9149 100644 --- a/addressbook/gui/component/select-names/e-select-names-manager.c +++ b/addressbook/gui/component/select-names/e-select-names-manager.c @@ -335,9 +335,9 @@ update_completion_books (ESelectNamesManager *manager) ESource *source = E_SOURCE (sources->data); const char *completion = e_source_get_property (source, "completion"); if (completion && !g_ascii_strcasecmp (completion, "true")) { - EBook *book = e_book_new (); + EBook *book = e_book_new (source, NULL); g_object_ref (manager); - addressbook_load_source (book, source, open_book_cb, manager); + addressbook_load (book, open_book_cb, manager); } } } diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 25c79790f9..894d5e9847 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -154,12 +154,12 @@ addressbook_model_set_source (ESelectNames *e_select_names, EABModel *model, ESo { EBook *book; - book = e_book_new(); + book = e_book_new(source, NULL); g_object_ref(e_select_names); g_object_ref(model); - addressbook_load_source (book, source, (EBookCallback) set_book, e_select_names); + addressbook_load (book, (EBookCallback) set_book, e_select_names); } static void * -- cgit v1.2.3