e_book_load_uri -> addressbook_load_uri.

2001-10-05  Chris Toshok  <toshok@ximian.com>

	* 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

1 files changed, 3 insertions, 3 deletions

diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 893354642b..a2c0eb9056 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -319,7 +319,7 @@ user_create_new_item_cb (EvolutionShellComponent *shell_component,
 		book = e_book_new ();
 		uri = g_strdup_printf ("%s/addressbook.db", parent_folder_physical_uri);
 
-		if (e_book_load_uri (book, uri, nonlocal_addressbook_cb, GINT_TO_POINTER (is_contact_list)) == 0)
+		if (addressbook_load_uri (book, uri, nonlocal_addressbook_cb, GINT_TO_POINTER (is_contact_list)) == 0)
 			g_warning ("Couldn't load addressbook %s", uri);
 
 		g_free (uri);
@@ -377,8 +377,8 @@ destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *fol
 	expanded_uri = addressbook_expand_uri (physical_uri);
 
 	book = e_book_new ();
-	e_book_load_uri (book, expanded_uri,
-			 (EBookCallback)dnd_drop_book_open_cb, card_list);
+	addressbook_load_uri (book, expanded_uri,
+			      (EBookCallback)dnd_drop_book_open_cb, card_list);
 
 	g_free (expanded_uri);