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, 4 insertions, 6 deletions

diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c
index f34d5f8c27..c2e361ce40 100644
--- a/camel/camel-pgp-context.c
+++ b/camel/camel-pgp-context.c
@@ -192,9 +192,9 @@ pgp_get_passphrase (CamelSession *session, CamelPgpType pgp_type, char *userid)
 					  type);
 	
 	/* Use the userid as a key if possible, else be generic and use the type */
-	passphrase = camel_session_query_authenticator (session, CAMEL_AUTHENTICATOR_ASK,
-							prompt, TRUE, NULL, userid ? userid : (char *) type,
-							NULL);
+	passphrase = camel_session_get_password (session, prompt, TRUE,
+						 NULL, userid ? userid : type,
+						 NULL);
 	g_free (prompt);
 	
 	return passphrase;
@@ -208,9 +208,7 @@ pgp_forget_passphrase (CamelSession *session, CamelPgpType pgp_type, char *useri
 	if (!userid)
 		type = pgp_get_type_as_string (pgp_type);
 	
-	camel_session_query_authenticator (session, CAMEL_AUTHENTICATOR_TELL,
-					   NULL, FALSE, NULL, userid ? userid : (char *) type,
-					   NULL);
+	camel_session_forget_password (session, NULL, userid ? userid : type, NULL);
 }
 
 static int