X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=0153bc39520ad92d06126c18d2ff41987f5c4226;hp=5df2b213548abbc93bcead3376bba1be2df2eb9b;hb=0dc3054df348d3c9788ecf6aba028668c684a7bc;hpb=07ccefd6c97ddd433d8432f7b4596a5572e09b48

diff --git a/handler.c b/handler.c
index 5df2b21..0153bc3 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;
     }
 
@@ -1385,7 +1385,7 @@ int mutt_body_handler (BODY * b, STATE * s)
       if (!plaintext) {
         /* decode to a tempfile, saving the original destination */
         fp = s->fpout;
-        s->fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+        s->fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
         if (!s->fpout) {
           mutt_error _("Unable to open temporary file!");
           goto bail;