diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-09-26 08:09:09 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-09-26 08:09:09 +0800 |
| commit | f06f7a283659fa559e5377d015af65658ef73717 (patch) | |
| tree | 585a8d045a08583465d745ffaba71ac116c4bf3d /mail/mail-format.c | |
| parent | 99949cdd3907da9d310fe4a8f8bf927fd4069e58 (diff) | |
| download | gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar.gz gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar.bz2 gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar.lz gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar.xz gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar.zst gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.zip | |
Update to not send the remember-passphrase option to the context, it
2001-09-25 Jeffrey Stedfast <fejj@ximian.com>
* mail-format.c (decode_pgp): Update to not send the
remember-passphrase option to the context, it doesn't need it
anymore.
(try_inline_pgp_sig): Same.
* mail-accounts.c (construct): The remember-passphrase option is
no longer there. This can now be set on the passphrase prompt
dialog.
(construct): Add confirm expunge options.
* mail-config.c (config_read): We no longer read-in the
remember-passphrase state because we no longer need it.
(mail_config_write_on_exit): We no longer save it either.
(mail_config_get_remember_pgp_passphrase): Removed.
(mail_config_set_remember_pgp_passphrase): Removed.
* mail-crypto.c (mail_crypto_pgp_mime_part_sign): No longer do we
need to send the remember passphrase state to the pgp context.
(mail_crypto_pgp_mime_part_verify): Same.
(mail_crypto_pgp_mime_part_encrypt): Here too.
(mail_crypto_pgp_mime_part_decrypt): And here.
svn path=/trunk/; revision=13139
Diffstat (limited to 'mail/mail-format.c')
| -rw-r--r-- | mail/mail-format.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mail/mail-format.c b/mail/mail-format.c index 584db2b01c..f76431bbda 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -1340,8 +1340,7 @@ 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_remember_pgp_passphrase ()); + mail_config_get_pgp_path ()); if (ctx) { camel_pgp_decrypt (ctx, ciphertext, plaintext, &ex); @@ -1500,8 +1499,7 @@ try_inline_pgp_sig (char *start, CamelMimePart *part, 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_remember_pgp_passphrase ()); + mail_config_get_pgp_path ()); if (context) { CamelMimeFilterCharset *charset_filter; |