X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc2231.c;h=da505107d6ff84301b338adf8c1a6724f63e5d69;hp=287c1d6d38a76cd9ff2b6cc876d2e5720abe3c4b;hb=80566f6aedda1e4bdcca38f9cb27101b5ba1029f;hpb=f3cbb9f51357972f6e74244494236a41dc4d84cd

diff --git a/lib-mime/rfc2231.c b/lib-mime/rfc2231.c
index 287c1d6..da50510 100644
--- a/lib-mime/rfc2231.c
+++ b/lib-mime/rfc2231.c
@@ -186,7 +186,7 @@ rfc2231_join_continuations(parameter_t **head, rfc2231_param *par)
 
         if (value) {
             if (encoded)
-                mutt_convert_string (&value, charset, Charset, M_ICONV_HOOK_FROM);
+                mutt_convert_string (&value, charset, MCharset.charset, M_ICONV_HOOK_FROM);
             *head = parameter_new();
             (*head)->attribute = m_strdup(attribute);
             (*head)->value = value;
@@ -236,7 +236,7 @@ void rfc2231_decode_parameters (parameter_t ** headp)
             if (p->value && strstr(p->value, "=?")) {
                 rfc2047_decode(&p->value);
             } else {
-                if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII)
+                if (mime_which_token(MCharset.assumed_charset, -1) == MIME_US_ASCII)
                     mutt_convert_nonmime_string(&p->value);
             }
 
@@ -249,7 +249,7 @@ void rfc2231_decode_parameters (parameter_t ** headp)
 
             s = rfc2231_get_charset (p->value, charset, sizeof (charset));
             rfc2231_decode_one (p->value, s);
-            mutt_convert_string (&p->value, charset, Charset, M_ICONV_HOOK_FROM);
+            mutt_convert_string (&p->value, charset, MCharset.charset, M_ICONV_HOOK_FROM);
 
             *last = p;
             last = &p->next;
@@ -313,13 +313,13 @@ int rfc2231_encode_string(char **s)
             return 0;
     }
 
-    if (Charset && SendCharset) {
-        charset = mutt_choose_charset(Charset, SendCharset,
+    if (MCharset.charset && MCharset.send_charset) {
+        charset = mutt_choose_charset(MCharset.charset, MCharset.send_charset,
                                       *s, m_strlen(*s), &d, &dlen);
     }
 
     if (!charset) {
-        charset = m_strdup(Charset ? Charset : "unknown-8bit");
+        charset = m_strdup(MCharset.charset ?: "unknown-8bit");
         d = *s;
         dlen = m_strlen(d);
     }