diff options
| author | Chris Toshok <toshok@ximian.com> | 2004-05-20 09:16:30 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2004-05-20 09:16:30 +0800 |
| commit | 47c3838fee257737f17aae3696a8dda177af7a35 (patch) | |
| tree | 700f2c3e3cd6fe3b13eeff901c7ea3c49daf76a6 /addressbook/conduit/address-conduit.c | |
| parent | 5bc91a74fecf9f6eecff4281408743ab694e26df (diff) | |
| download | gsoc2013-evolution-47c3838fee257737f17aae3696a8dda177af7a35.tar gsoc2013-evolution-47c3838fee257737f17aae3696a8dda177af7a35.tar.gz gsoc2013-evolution-47c3838fee257737f17aae3696a8dda177af7a35.tar.bz2 gsoc2013-evolution-47c3838fee257737f17aae3696a8dda177af7a35.tar.lz gsoc2013-evolution-47c3838fee257737f17aae3696a8dda177af7a35.tar.xz gsoc2013-evolution-47c3838fee257737f17aae3696a8dda177af7a35.tar.zst gsoc2013-evolution-47c3838fee257737f17aae3696a8dda177af7a35.zip | |
use the new e_book_new and e_book_open apis.
2004-05-19 Chris Toshok <toshok@ximian.com>
* 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
Diffstat (limited to 'addressbook/conduit/address-conduit.c')
| -rw-r--r-- | addressbook/conduit/address-conduit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index 5fcf55762e..555e470fda 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -1145,8 +1145,9 @@ pre_sync (GnomePilotConduit *conduit, ctxt->dbi = dbi; /* FIXME Need to allow our own concept of "local" */ - ctxt->ebook = e_book_new (); - if (!e_book_load_local_addressbook (ctxt->ebook, NULL)) { + ctxt->ebook = e_book_new_system_addressbook (NULL); + if (!ctxt->ebook + || !e_book_open (ctxt->ebook, FALSE, NULL)) { WARN(_("Could not load addressbook")); gnome_pilot_conduit_error (conduit, _("Could not load addressbook")); |