X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=abe7f65e654fb773011c1dcdab73ca5042450230;hp=c5c8301bb4855f28f957881f676052d889704159;hb=7dea2ed3be5f5aaa2975647e69a414925ccb3cb8;hpb=9ab647c0e8dd74fef4f067f7f7356ffbb13da0b7

diff --git a/handler.c b/handler.c
index c5c8301..abe7f65 100644
--- 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);
     }
   }
 
@@ -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;