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, 5 insertions, 0 deletions

diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h
index 717b40e150..5cf14dba12 100644
--- a/addressbook/gui/component/addressbook.h
+++ b/addressbook/gui/component/addressbook.h
@@ -2,10 +2,15 @@
 #define __ADDRESSBOOK_H__
 
 #include <bonobo/bonobo-control.h>
+#include <ebook/e-book.h>
 
 /* expand file:///foo/foo/ to file:///foo/foo/addressbook.db */
 char *         addressbook_expand_uri           (const char *uri);
 
+/* use this instead of e_book_load_uri everywhere where you want the
+   authentication to be handled for you. */
+gboolean       addressbook_load_uri             (EBook *book, const char *uri, EBookCallback cb, gpointer closure);
+
 BonoboControl *addressbook_factory_new_control  (void);
 void           addressbook_factory_init         (void);