X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=handler.c;h=30434af45e8a6cefacbacc64f454b8312e1abccc;hb=378ab81aa9abf4db714638c3e2e786e6cc58d2b1;hp=da10849406f5df4ab9b1ec86a3ee2317d1aeca83;hpb=1d2617e5d89468db7cd1b93fd2b31af73cd7c8ff;p=apps%2Fmadmutt.git

diff --git a/handler.c b/handler.c
index da10849..30434af 100644
--- a/handler.c
+++ b/handler.c
@@ -1250,12 +1250,12 @@ void mutt_decode_attachment (BODY * b, STATE * s)
       const char *charset = parameter_getval(b->parameter, "charset");
 
       if (!charset)
-        charset = charset_getfirst(MCharset.assumed_charset);
-      if (charset && MCharset.charset)
-        cd = mutt_iconv_open (MCharset.charset, charset, M_ICONV_HOOK_FROM);
+        charset = charset_getfirst(mod_cset.assumed_charset);
+      if (charset && mod_cset.charset)
+        cd = mutt_iconv_open (mod_cset.charset, charset, M_ICONV_HOOK_FROM);
     } else {
       if (b->file_charset)
-        cd = mutt_iconv_open (MCharset.charset, b->file_charset, M_ICONV_HOOK_FROM);
+        cd = mutt_iconv_open (mod_cset.charset, b->file_charset, M_ICONV_HOOK_FROM);
     }
   }
 
@@ -1383,7 +1383,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(MCore.tmpdir), NULL);
+        s->fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
         if (!s->fpout) {
           mutt_error _("Unable to open temporary file!");
           goto bail;