[ fixes bug 16097 ] gui love for the new auth stuff.

2002-01-24  Chris Toshok  <toshok@ximian.com>

	[ fixes bug 16097 ]
	* gui/component/addressbook-config.glade: gui love for the new
	auth stuff.

	* gui/component/addressbook.c (load_uri_cb): track change to auth,
	and offer up different prompt strings depending on which method
	(binddn or email) we're using.

	* gui/component/addressbook-storage.c (ldap_unparse_auth): use the
	new auth types for ldap.
	(ldap_parse_auth): same.
	(addressbook_storage_auth_type_to_string): new function.
	(load_source_data): get the binddn too.
	(ldap_source_foreach): store out binddn or emailaddr, depending on
	the auth type chosen.

	* gui/component/addressbook-storage.h: add the more detailed auth
	types, add "binddn" to the source structure, and add a prototype
	for addressbook_storage_auth_type_to_string.

	* gui/component/addressbook-config.c (auth_checkbutton_changed):
	set the auth stuff  (in)sensitive.
	(auth_optionmenu_activated): new function.
	(addressbook_source_dialog_set_source): track UI change.
	(addressbook_source_dialog_get_source): same.
	(add_scope_activate_cb): rename add_activate_cb to this to
	distinguish it from the auth stuff.
	(add_auth_activate_cb): new function.
	(addressbook_source_dialog): track change to auth UI stuff.
	(addressbook_storage_auth_type_to_string): new function.

	* backend/ebook/e-book.h: add auth_method arg to
	e_book_authenticate_user.

	* backend/ebook/e-book.c (e_book_authenticate_user): track change
	to prototype - add auth_method arg, and pass it along to the CORBA
	call.

	* backend/ebook/test-client.c (book_open_cb): track api change -
	keep this building.

	* backend/pas/pas-book.h: add auth_method slot in PASRequest.

	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): add
	auth_method arg and add it to the PASRequest.
	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): track
	idl change, add auth_method and pass it along to
	pas_book_queue_authenticate_user.

	* backend/pas/pas-backend-ldap.c
	(pas_backend_ldap_process_authenticate_user): support both
	"ldap/simple-email" and "ldap/simple-binddn" auth methods.

	* backend/idl/addressbook.idl: add "in string authMethod" to
	authenticateUser.

svn path=/trunk/; revision=15467

3 files changed, 5 insertions, 2 deletions

diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index d787ee8e01..fdc7252cfa 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -888,6 +888,7 @@ void
 e_book_authenticate_user (EBook         *book,
 			  const char    *user,
 			  const char    *passwd,
+			  const char    *auth_method,
 			  EBookCallback cb,
 			  gpointer      closure)
 {
@@ -908,6 +909,7 @@ e_book_authenticate_user (EBook         *book,
 	GNOME_Evolution_Addressbook_Book_authenticateUser (book->priv->corba_book,
 							   user,
 							   passwd,
+							   auth_method,
 							   &ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
diff --git a/addressbook/backend/ebook/e-book.h b/addressbook/backend/ebook/e-book.h
index cf90c8c57d..1403a23f60 100644
--- a/addressbook/backend/ebook/e-book.h
+++ b/addressbook/backend/ebook/e-book.h
@@ -74,6 +74,7 @@ guint     e_book_get_supported_fields     (EBook                 *book,
 void      e_book_authenticate_user        (EBook                 *book,
 					   const char            *user,
 					   const char            *passwd,
+					   const char            *auth_method,
 					   EBookCallback         cb,
 					   gpointer              closure);
 
diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
index 44b20ebdde..900edcd024 100644
--- a/addressbook/backend/ebook/test-client.c
+++ b/addressbook/backend/ebook/test-client.c
@@ -128,7 +128,7 @@ auth_user_cb (EBook *book, EBookStatus status, gpointer closure)
 static void
 book_open_cb (EBook *book, EBookStatus status, gpointer closure)
 {
-	e_book_authenticate_user (book, "username", "password", auth_user_cb, NULL);
+	e_book_authenticate_user (book, "username", "password", "auth_method", auth_user_cb, NULL);
 }
 
 static guint
@@ -146,7 +146,7 @@ ebook_create (void)
 	}
 	
 
-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
+	if (! e_book_load_default_book (book, book_open_cb, NULL)) {
 		printf ("error calling load_uri!\n");
 	}