From 2a92bbba53368e4cf2509d40dc044436eb59e3fd Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 5 Oct 2001 22:30:22 +0000 Subject: e_book_load_uri -> addressbook_load_uri. 2001-10-05 Chris Toshok * gui/component/select-names/e-select-names.c (addressbook_model_set_uri): e_book_load_uri -> addressbook_load_uri. * gui/component/select-names/e-select-names-manager.c (e_select_names_manager_new): e_book_load_uri -> addressbook_load_uri. * gui/component/addressbook.c (forget_passwords_cb): new function, call e_passwords_forget_passwords. (verbs): Add ContactsForgetPasswords. (load_uri_auth_cb): new function, call the callback and free up our closure stuff. (load_uri_cb): once the uri is loaded, check if we're configured to authenticate for it, and do so, using the e_passwords stuff. (addressbook_load_uri): wrapper around e_book_load_uri. save off the parameters and start the load-with-auth machinery. (book_open_cb): remove all the auth stuff from here, as it's handled elsewhere now. * gui/component/addressbook-factory.c (main): call e_passwords_init. * gui/component/addressbook-component.c (user_create_new_item_cb): e_book_load_uri -> addressbook_load_uri. (destination_folder_handle_drop): same. * gui/component/addressbook.h: add prototype for addressbook_load_uri (a wrapper around e_book_load_uri that also handles authentication if the user selects it.) svn path=/trunk/; revision=13475 --- addressbook/gui/component/select-names/e-select-names-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui/component/select-names/e-select-names-manager.c') 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 ffb88aa499..2d8501411b 100644 --- a/addressbook/gui/component/select-names/e-select-names-manager.c +++ b/addressbook/gui/component/select-names/e-select-names-manager.c @@ -128,7 +128,7 @@ e_select_names_manager_new (void) if (val) { manager->completion_book = e_book_new (); gtk_object_ref (GTK_OBJECT (manager)); /* ref ourself before our async call */ - e_book_load_uri (manager->completion_book, val, (EBookCallback)open_book_cb, manager); + addressbook_load_uri (manager->completion_book, val, (EBookCallback)open_book_cb, manager); g_free (val); } else -- cgit v1.2.3