aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-07-10 05:39:38 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-07-10 05:39:38 +0800
commit25efa799eebf0b057a91d05a36ffadb9eeb5b9db (patch)
tree4ee014d4f86a43fac7a27a8826dec1e5efda9341
parent29315f8157b6cab9b8876eeea92356241970a536 (diff)
downloadgsoc2013-evolution-25efa799eebf0b057a91d05a36ffadb9eeb5b9db.tar
gsoc2013-evolution-25efa799eebf0b057a91d05a36ffadb9eeb5b9db.tar.gz
gsoc2013-evolution-25efa799eebf0b057a91d05a36ffadb9eeb5b9db.tar.bz2
gsoc2013-evolution-25efa799eebf0b057a91d05a36ffadb9eeb5b9db.tar.lz
gsoc2013-evolution-25efa799eebf0b057a91d05a36ffadb9eeb5b9db.tar.xz
gsoc2013-evolution-25efa799eebf0b057a91d05a36ffadb9eeb5b9db.tar.zst
gsoc2013-evolution-25efa799eebf0b057a91d05a36ffadb9eeb5b9db.zip
Update to pass in the `remember' argument when creating a new pgp context.
2001-07-09 Jeffrey Stedfast <fejj@ximian.com> * mail-format.c (decode_pgp): Update to pass in the `remember' argument when creating a new pgp context. (try_inline_pgp_sig): And here... * mail-crypto.c (mail_crypto_pgp_mime_part_sign): Update to pass in the `remember' argument when creating a new pgp context. (mail_crypto_pgp_mime_part_verify): Same. (mail_crypto_pgp_mime_part_encrypt): And here... (mail_crypto_pgp_mime_part_decrypt): And finally here. * mail-config.c (mail_config_get_remember_pgp_passphrase): New. (mail_config_set_remember_pgp_passphrase): New. (config_read): Read in the "remember passphrase" value. (mail_config_write_on_exit): Save the remember-passphrase value. * mail-accounts.c (construct): Allow the user to set "Remember PGP Passphrase". (remember_pgp_passphrase_toggled): Set the toggle state. svn path=/trunk/; revision=10934
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/mail-crypto.c8
-rw-r--r--mail/mail-format.c6
3 files changed, 12 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 17dab48fb2..6d9cec5276 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,9 @@
2001-07-09 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-format.c (decode_pgp): Update to pass in the `remember'
+ argument when creating a new pgp context.
+ (try_inline_pgp_sig): And here...
+
* mail-crypto.c (mail_crypto_pgp_mime_part_sign): Update to pass
in the `remember' argument when creating a new pgp context.
(mail_crypto_pgp_mime_part_verify): Same.
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index f7e003f07c..2028e5bf28 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -50,7 +50,7 @@ mail_crypto_pgp_mime_part_sign (CamelMimePart **mime_part, const char *userid, C
context = camel_pgp_context_new (session, mail_config_get_pgp_type (),
mail_config_get_pgp_path (),
- mail_config_get_pgp_remember_pgp_passphrase ());
+ mail_config_get_remember_pgp_passphrase ());
if (context) {
camel_pgp_mime_part_sign (context, mime_part, userid, hash, ex);
@@ -76,7 +76,7 @@ mail_crypto_pgp_mime_part_verify (CamelMimePart *mime_part, CamelException *ex)
context = camel_pgp_context_new (session, mail_config_get_pgp_type (),
mail_config_get_pgp_path (),
- mail_config_get_pgp_remember_pgp_passphrase ());
+ mail_config_get_remember_pgp_passphrase ());
if (context) {
valid = camel_pgp_mime_part_verify (context, mime_part, ex);
@@ -106,7 +106,7 @@ mail_crypto_pgp_mime_part_encrypt (CamelMimePart **mime_part, GPtrArray *recipie
context = camel_pgp_context_new (session, mail_config_get_pgp_type (),
mail_config_get_pgp_path (),
- mail_config_get_pgp_remember_pgp_passphrase ());
+ mail_config_get_remember_pgp_passphrase ());
if (context) {
camel_pgp_mime_part_encrypt (context, mime_part, recipients, ex);
@@ -132,7 +132,7 @@ mail_crypto_pgp_mime_part_decrypt (CamelMimePart *mime_part, CamelException *ex)
context = camel_pgp_context_new (session, mail_config_get_pgp_type (),
mail_config_get_pgp_path (),
- mail_config_get_pgp_remember_pgp_passphrase ());
+ mail_config_get_remember_pgp_passphrase ());
if (context) {
part = camel_pgp_mime_part_decrypt (context, mime_part, ex);
diff --git a/mail/mail-format.c b/mail/mail-format.c
index e9291e7bf5..7dcbc978cb 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1094,7 +1094,8 @@ decode_pgp (CamelStream *ciphertext, CamelStream *plaintext, MailDisplay *md)
CamelPgpContext *ctx;
ctx = camel_pgp_context_new (session, mail_config_get_pgp_type (),
- mail_config_get_pgp_path ());
+ mail_config_get_pgp_path (),
+ mail_config_get_remember_pgp_passphrase ());
if (ctx) {
camel_pgp_decrypt (ctx, ciphertext, plaintext, &ex);
@@ -1238,7 +1239,8 @@ try_inline_pgp_sig (char *start, MailDisplay *md)
mail_html_write (md->html, md->stream, "<hr>");
context = camel_pgp_context_new (session, mail_config_get_pgp_type (),
- mail_config_get_pgp_path ());
+ mail_config_get_pgp_path (),
+ mail_config_get_remember_pgp_passphrase ());
if (context) {
CamelStream *ciphertext;