aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-pgp-context.c
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-04-28 05:08:08 +0800
committerDan Winship <danw@src.gnome.org>2001-04-28 05:08:08 +0800
commit63e96e100291b330e75cc3b3b49795c720e5ffa0 (patch)
treee87946a64b23a35dacb190c43676f14691187b98 /camel/camel-pgp-context.c
parentd06ca412e46d6b4fc2ecd3e1e956b1e8970c8867 (diff)
downloadgsoc2013-evolution-63e96e100291b330e75cc3b3b49795c720e5ffa0.tar.gz
gsoc2013-evolution-63e96e100291b330e75cc3b3b49795c720e5ffa0.tar.zst
gsoc2013-evolution-63e96e100291b330e75cc3b3b49795c720e5ffa0.zip
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
Diffstat (limited to 'camel/camel-pgp-context.c')
-rw-r--r--camel/camel-pgp-context.c10
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