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

3 files changed, 14 insertions, 18 deletions

diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 38f585d6e7..9921de90c5 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -466,9 +466,8 @@ imap_auth_loop (CamelService *service, CamelException *ex)
 	while (!authenticated) {
 		if (errbuf) {
 			/* We need to un-cache the password before prompting again */
-			camel_session_query_authenticator (
-				session, CAMEL_AUTHENTICATOR_TELL, NULL,
-				TRUE, service, "password", ex);
+			camel_session_forget_password (
+				session, service, "password", ex);
 			g_free (service->url->passwd);
 			service->url->passwd = NULL;
 		}
@@ -482,9 +481,9 @@ imap_auth_loop (CamelService *service, CamelException *ex)
 						  service->url->user,
 						  service->url->host);
 			service->url->passwd =
-				camel_session_query_authenticator (
-					session, CAMEL_AUTHENTICATOR_ASK,
-					prompt, TRUE, service, "password", ex);
+				camel_session_get_password (
+					session, prompt, TRUE,
+					service, "password", ex);
 			g_free (prompt);
 			g_free (errbuf);
 			errbuf = NULL;
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index c163e844c9..2703f4b0fb 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -369,10 +369,9 @@ pop3_try_authenticate (CamelService *service, gboolean kpop,
 					    "for %s@%s"), errmsg ? errmsg : "",
 					  service->url->user,
 					  service->url->host);
-		service->url->passwd = camel_session_query_authenticator (
+		service->url->passwd = camel_session_get_password (
 			camel_service_get_session (service),
-			CAMEL_AUTHENTICATOR_ASK, prompt, TRUE,
-			service, "password", ex);
+			prompt, TRUE, service, "password", ex);
 		g_free (prompt);
 		if (!service->url->passwd)
 			return FALSE;
@@ -449,10 +448,9 @@ pop3_connect (CamelService *service, CamelException *ex)
 			camel_exception_clear (ex);
 
 			/* Uncache the password before prompting again. */
-			camel_session_query_authenticator (
+			camel_session_forget_password (
 				camel_service_get_session (service),
-				CAMEL_AUTHENTICATOR_TELL, NULL, TRUE, service,
-				"password", ex);
+				service, "password", ex);
 			g_free (service->url->passwd);
 			service->url->passwd = NULL;
 		}
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 5241394058..e6f0b8cafa 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -375,9 +375,8 @@ smtp_connect (CamelService *service, CamelException *ex)
 		while (!authenticated) {
 			if (errbuf) {
 				/* We need to un-cache the password before prompting again */
-				camel_session_query_authenticator (
-					session, CAMEL_AUTHENTICATOR_TELL, NULL,
-					TRUE, service, "password", ex);
+				camel_session_forget_password (
+					session, service, "password", ex);
 				g_free (service->url->passwd);
 				service->url->passwd = NULL;
 			}
@@ -390,9 +389,9 @@ smtp_connect (CamelService *service, CamelException *ex)
 							  service->url->host);
 				
 				service->url->passwd =
-					camel_session_query_authenticator (
-						session, CAMEL_AUTHENTICATOR_ASK,
-						prompt, TRUE, service, "password", ex);
+					camel_session_get_password (
+						session, prompt, TRUE,
+						service, "password", ex);
 				
 				g_free (prompt);
 				g_free (errbuf);