2010-02-10 [colin] 3.7.5cvs16

[claws.git] / src / textview.c

diff --git a/src/textview.c b/src/textview.c
index 620e3b7aa40af771b50b0c6266d32aa907a3dfca..2d0901b5906774c3bf67f5a8d736783ade4a4a58 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -933,9 +933,16 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
        if (textview->messageview->forced_charset)
                charset = textview->messageview->forced_charset;
        else {
+               /* use supersets transparently when possible */
                charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
                if (charset && !strcasecmp(charset, CS_ISO_8859_1))
                        charset = CS_WINDOWS_1252;
+               else if (charset && !strcasecmp(charset, CS_X_GBK))
+                       charset = CS_GB18030;
+               else if (charset && !strcasecmp(charset, CS_GBK))
+                       charset = CS_GB18030;
+               else if (charset && !strcasecmp(charset, CS_GB2312))
+                       charset = CS_GB18030;
        }
 
        textview_set_font(textview, charset);