drop unused prototypes

[apps/madmutt.git] / handler.c

diff --git a/handler.c b/handler.c
index 5df2b21..abe7f65 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -1252,12 +1252,12 @@ void mutt_decode_attachment (BODY * b, STATE * s)
       const char *charset = parameter_getval(b->parameter, "charset");
 
       if (!charset)
-        charset = charset_getfirst(AssumedCharset);
-      if (charset && Charset)
-        cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
+        charset = charset_getfirst(MCharset.assumed_charset);
+      if (charset && MCharset.charset)
+        cd = mutt_iconv_open (MCharset.charset, charset, M_ICONV_HOOK_FROM);
     } else {
       if (b->file_charset)
-        cd = mutt_iconv_open (Charset, b->file_charset, M_ICONV_HOOK_FROM);
+        cd = mutt_iconv_open (MCharset.charset, b->file_charset, M_ICONV_HOOK_FROM);
     }
   }
 
@@ -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;