From: Thomas Roessler <roessler@does-not-exist.org>
Date: Wed, 14 Oct 1998 22:24:33 +0000 (+0000)
Subject: When Charset is utf-8 (not recommended!), don't active utf8
X-Git-Tag: mutt-0-94-13-rel~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7f9b007f30ee97513617c88c3fae38f382194b6;p=mutt

When Charset is utf-8 (not recommended!), don't active utf8
translation in the various handler routines.
---

diff --git a/handler.c b/handler.c
index fa699cf7..abde7b19 100644
--- a/handler.c
+++ b/handler.c
@@ -85,7 +85,7 @@ void mutt_decode_xbit (STATE *s, BODY *b, int istext)
     char *charset = mutt_get_parameter("charset", b->parameter);
     int is_utf8;
 
-    if((is_utf8 = mutt_is_utf8(charset)))
+    if((is_utf8 = (mutt_is_utf8(charset) && !mutt_is_utf8(Charset)))
       chs = mutt_get_charset(Charset);
     else
       map = mutt_get_translation(charset, Charset);
@@ -141,7 +141,7 @@ void mutt_decode_quoted (STATE *s, BODY *b, int istext)
   
   if(istext)
   {
-    if((is_utf8 = mutt_is_utf8(charset)))
+    if((is_utf8 = (mutt_is_utf8(charset) && !mutt_is_utf8(Charset))))
       chs = mutt_get_charset(Charset);
     else
       map = mutt_get_translation(charset, Charset);
@@ -223,7 +223,7 @@ void mutt_decode_base64 (STATE *s, BODY *b, int istext)
 
   if(istext)
   {
-    if((is_utf8 = mutt_is_utf8(charset)))
+    if((is_utf8 = (mutt_is_utf8(charset) && !mutt_is_utf8(Charset))))
       chs = mutt_get_charset(Charset);
     else
       map = mutt_get_translation(charset, Charset);