From 63e96e100291b330e75cc3b3b49795c720e5ffa0 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Fri, 27 Apr 2001 21:08:08 +0000
Subject: 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
---
camel/providers/smtp/camel-smtp-transport.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
(limited to 'camel/providers/smtp')
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);
--
cgit v1.2.3