Redo this a lot so that instead of having a class full of callbacks, we

	* camel-session.c: Redo this a lot so that instead of having a
	class full of callbacks, we have a subclassable class. Also,
	replace the increasingly horrifying
	camel_session_query_authenticator with three new routines,
	camel_session_get_password, camel_session_forget_password, and
	camel_session_alert_user.

	* camel-pgp-context.c:
	* camel-pkcs7-context.c:
	* camel-smime-context.c:
	* providers/imap/camel-imap-store.c:
	* providers/pop3/camel-pop3-store.c:
	* providers/smtp/camel-smtp-transport.c:
	Use camel_session_get_password / camel_session_forget_password.

	* camel-tcp-stream-ssl.c (ssl_bad_cert): Use
	camel_session_alert_user.

svn path=/trunk/; revision=9617

1 files changed, 2 insertions, 3 deletions

diff --git a/camel/camel-pkcs7-context.c b/camel/camel-pkcs7-context.c
index fee277e079..185ae09ccc 100644
--- a/camel/camel-pkcs7-context.c
+++ b/camel/camel-pkcs7-context.c
@@ -195,9 +195,8 @@ get_password (void *arg, SECKEYKeyDBHandle *handle)
 		return pwitem;
 	
 	prompt = g_strdup_printf (_("Please enter your password for %s"), userid);
-	passwd = camel_session_query_authenticator (session, CAMEL_AUTHENTICATOR_ASK,
-						    prompt, TRUE, NULL, userid,
-						    NULL);
+	passwd = camel_session_get_password (session, prompt, TRUE,
+					     NULL, userid, NULL);
 	g_free (prompt);
 	
 	/* hash the password */