From: Pierre Habouzit Date: Mon, 12 Feb 2007 18:25:29 +0000 (+0100) Subject: fix stupid problem with encrypted gpg mails. X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=9ab647c0e8dd74fef4f067f7f7356ffbb13da0b7;p=apps%2Fmadmutt.git fix stupid problem with encrypted gpg mails. Signed-off-by: Pierre Habouzit --- diff --git a/handler.c b/handler.c index 5df2b21..c5c8301 100644 --- a/handler.c +++ b/handler.c @@ -1357,7 +1357,7 @@ int mutt_body_handler (BODY * b, STATE * s) if (!p) mutt_error(_("Error: multipart/encrypted has no protocol parameter!")); - else if (tok == MIME_APPLICATION_PGP_ENCRYPTED) + else if (mime_which_token(p, -1) == MIME_APPLICATION_PGP_ENCRYPTED) handler = crypt_pgp_encrypted_handler; } diff --git a/lib-mime/crypt.c b/lib-mime/crypt.c index 2ef6c42..7c55f2b 100644 --- a/lib-mime/crypt.c +++ b/lib-mime/crypt.c @@ -117,7 +117,7 @@ int mutt_is_application_pgp (BODY * m) t |= PGPSIGN; break; - case MIME_PGP_ENCRYPT: + case MIME_PGP_ENCRYPTED: t |= PGPENCRYPT; break; diff --git a/lib-mime/mime-token.def b/lib-mime/mime-token.def index 0edef85..8303e05 100644 --- a/lib-mime/mime-token.def +++ b/lib-mime/mime-token.def @@ -57,7 +57,7 @@ newsgroups octet-stream organization pgp -pgp-encrypt +pgp-encrypted pgp-keys pgp-signed pkcs7-mime