Mac-Cyrillic menu updates. patch by Anton Butanaev

[claws.git] / src / procmime.c

diff --git a/src/procmime.c b/src/procmime.c
index a4630261dea75726d1c5b416d823ca8342541c72..e15738d0c1170b8aa97ca0bd69e27a142d4e389b 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -819,7 +819,7 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
                }
                ertf_parser_destroy(parser);
                conv_code_converter_destroy(conv);
-       } else if (mimeinfo->type == MIMETYPE_TEXT) {
+       } else if (mimeinfo->type == MIMETYPE_TEXT && mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT) {
                while (SC_FGETS(buf, sizeof(buf), tmpfp) != NULL) {
                        str = conv_codeset_strdup(buf, src_codeset, CS_UTF_8);
                        if (str) {
@@ -1269,6 +1269,8 @@ EncodingType procmime_get_encoding_for_charset(const gchar *charset)
                return ENC_7BIT;
        else if (!g_ascii_strcasecmp(charset, "ISO-8859-5") ||
                 !g_ascii_strncasecmp(charset, "KOI8-", 5) ||
+                !g_ascii_strcasecmp(charset, "X-MAC-CYRILLIC") ||
+                !g_ascii_strcasecmp(charset, "MAC-CYRILLIC") ||
                 !g_ascii_strcasecmp(charset, "Windows-1251"))
                return ENC_8BIT;
        else if (!g_ascii_strncasecmp(charset, "ISO-8859-", 9))