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/gui/contact-editor | |
| 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/gui/contact-editor')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 1e9b3adb99..85b2f2f5dc 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2204,7 +2204,7 @@ static void cancel_load (EContactEditor *editor) { if (editor->load_source_id) { - addressbook_load_source_cancel (editor->load_source_id); + addressbook_load_cancel (editor->load_source_id); editor->load_source_id = 0; g_object_unref (editor->load_book); @@ -2225,9 +2225,9 @@ source_selected (GtkWidget *source_option_menu, ESource *source, EContactEditor return; } - editor->load_book = e_book_new (); - editor->load_source_id = addressbook_load_source (editor->load_book, source, - (EBookCallback) new_target_cb, editor); + editor->load_book = e_book_new (source, NULL); + editor->load_source_id = addressbook_load (editor->load_book, + (EBookCallback) new_target_cb, editor); } static void |