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/component/addressbook-view.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/gui/component/addressbook-view.c')
-rw-r--r-- | addressbook/gui/component/addressbook-view.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index a87520703d..3b8c86cfef 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -681,8 +681,8 @@ delete_addressbook_cb (GtkWidget *widget, AddressbookView *view) } /* Remove local data */ - book = e_book_new (); - if (e_book_load_source (book, selected_source, TRUE, &error)) + book = e_book_new (selected_source, &error); + if (book) removed = e_book_remove (book, &error); if (removed) { @@ -876,12 +876,12 @@ selector_tree_drag_data_received (GtkWidget *widget, if (E_IS_SOURCE_GROUP (source) || e_source_get_readonly (source)) goto finish; - book = e_book_new (); + book = e_book_new (source, NULL); if (!book) { g_message (G_STRLOC ":Couldn't create EBook."); return FALSE; } - e_book_load_source (book, source, TRUE, NULL); + e_book_open (book, TRUE, NULL); contactlist = eab_contact_list_from_string (data->data); for (l = contactlist; l; l = l->next) { @@ -1128,8 +1128,6 @@ activate_source (AddressbookView *view, g_object_unref (book); } else { - book = e_book_new (); - g_object_get (uid_view, "source", &source, NULL); @@ -1139,11 +1137,18 @@ activate_source (AddressbookView *view, actually made it to book_open_cb yet. */ if (source) { - data = g_new (BookOpenData, 1); - data->view = g_object_ref (uid_view); - data->source = source; /* transfer the ref we get back from g_object_get */ - - addressbook_load_source (book, source, book_open_cb, data); + book = e_book_new (source, NULL); + + if (!book) { + g_object_unref (source); + } + else { + data = g_new (BookOpenData, 1); + data->view = g_object_ref (uid_view); + data->source = source; /* transfer the ref we get back from g_object_get */ + + addressbook_load (book, book_open_cb, data); + } } } } @@ -1177,13 +1182,13 @@ activate_source (AddressbookView *view, g_signal_connect (uid_view, "command_state_change", G_CALLBACK(update_command_state), view); - book = e_book_new (); + book = e_book_new (source, NULL); data = g_new (BookOpenData, 1); data->view = g_object_ref (uid_view); data->source = g_object_ref (source); - addressbook_load_source (book, source, book_open_cb, data); + addressbook_load (book, book_open_cb, data); } gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), |