turn charset into a lua package as well.

[apps/madmutt.git] / lib-mime / rfc822parse.c

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index 6aaae2f..3e77c57 100644 (file)
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -331,7 +331,7 @@ void mutt_parse_content_type(char *s, BODY *ct)
         pc = parameter_getval(ct->parameter, "charset");
         if (!pc) {
             parameter_setval(&ct->parameter, "charset",
-                             charset_getfirst(AssumedCharset));
+                             charset_getfirst(MCharset.assumed_charset));
         }
     }
 }
@@ -957,8 +957,8 @@ string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha
         /* restore the original line */
         line[m_strlen(line)] = ':';
 
-        if (weed && mutt_matches_ignore(line, Ignore)
-        && !mutt_matches_ignore(line, UnIgnore)) {
+        if (weed && string_list_contains(Ignore, line, "*")
+        && !string_list_contains(UnIgnore, line, "*")) {
             break;
         }