From b7a46c16244533f5c6a2d6964a4fbb591ccc5588 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Sat, 26 May 2007 14:08:33 +0200 Subject: [PATCH] always check for traditionnal GPG. Signed-off-by: Pierre Habouzit --- init.h | 10 ---------- lib-ui/curs_main.c | 18 ++++++------------ mutt.h | 1 - 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/init.h b/init.h index 456f55b..a69eb0b 100644 --- a/init.h +++ b/init.h @@ -1480,16 +1480,6 @@ struct option_t MuttVars[] = { ** ``reverse-''. ** (PGP only) */ - {"pgp_auto_decode", DT_BOOL, R_NONE, OPTPGPAUTODEC, "no" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will automatically attempt to decrypt traditional PGP - ** messages whenever the user performs an operation which ordinarily would - ** result in the contents of the message being operated on. For example, - ** if the user displays a pgp-traditional message which has not been manually - ** checked with the check-traditional-pgp function, Madmutt will automatically - ** check the message for traditional pgp. - */ {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, "yes" }, /* ** .pp diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c index 300dc8a..6648b1a 100644 --- a/lib-ui/curs_main.c +++ b/lib-ui/curs_main.c @@ -1271,8 +1271,7 @@ int mutt_index_menu (void) menu->current = mutt_thread_next_unread (Context, CURHDR); } - if (option (OPTPGPAUTODEC) && - (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))) + if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)) mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw); if ((op = mutt_display_message (CURHDR)) == -1) { @@ -1963,8 +1962,7 @@ int mutt_index_menu (void) CHECK_MX_ACL (Context, ACL_INSERT, _("Editing")); - if (option (OPTPGPAUTODEC) - && (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))) + if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)) mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw); mutt_edit_message (Context, tag ? NULL : CURHDR); menu->redraw = REDRAW_FULL; @@ -1977,8 +1975,7 @@ int mutt_index_menu (void) CHECK_VISIBLE; CHECK_ATTACH; - if (option (OPTPGPAUTODEC) && - (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))) + if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)) mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw); ci_send_message (SENDFORWARD, NULL, NULL, Context, tag ? NULL : CURHDR); menu->redraw = REDRAW_FULL; @@ -1990,8 +1987,7 @@ int mutt_index_menu (void) CHECK_VISIBLE; CHECK_ATTACH; - if (option (OPTPGPAUTODEC) && - (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))) + if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)) mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw); ci_send_message (SENDREPLY | SENDGROUPREPLY, NULL, NULL, Context, @@ -2005,8 +2001,7 @@ int mutt_index_menu (void) CHECK_MSGCOUNT; CHECK_VISIBLE; - if (option (OPTPGPAUTODEC) && - (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))) + if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)) mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw); ci_send_message (SENDREPLY | SENDLISTREPLY, NULL, NULL, Context, @@ -2147,8 +2142,7 @@ int mutt_index_menu (void) CHECK_MSGCOUNT; CHECK_VISIBLE; - if (option (OPTPGPAUTODEC) && - (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))) + if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)) mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw); ci_send_message (SENDREPLY, NULL, NULL, Context, tag ? NULL : CURHDR); diff --git a/mutt.h b/mutt.h index 512e9a4..0993bcc 100644 --- a/mutt.h +++ b/mutt.h @@ -301,7 +301,6 @@ enum { /* PGP options */ - OPTPGPAUTODEC, OPTPGPRETAINABLESIG, OPTFORWDECRYPT, OPTPGPSHOWUNUSABLE, -- 2.20.1