sync with sylpheed 0.6.4cvs1

[claws.git] / src / textview.c

diff --git a/src/textview.c b/src/textview.c
index 5279b97b81f6d96adaccaf59d89dd32eb9b1d3d9..130e4fb5ce74e3511553458c740485e326e05144 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -843,11 +843,13 @@ void textview_set_font(TextView *textview, const gchar *codeset)
        if (MB_CUR_MAX > 1) {
                if (codeset) {
                        if (!g_strncasecmp(codeset, "ISO-8859-", 9) ||
-                           !g_strncasecmp(codeset, "KOI8-", 5)     ||
-                           !g_strncasecmp(codeset, "CP", 2)        ||
-                           !g_strncasecmp(codeset, "WINDOWS-", 8)  ||
                            !g_strcasecmp(codeset, "BALTIC"))
                                use_fontset = FALSE;
+                       else if (conv_get_current_charset() != C_EUC_JP &&
+                                (!g_strncasecmp(codeset, "KOI8-", 5) ||
+                                 !g_strncasecmp(codeset, "CP", 2)    ||
+                                 !g_strncasecmp(codeset, "WINDOWS-", 8)))
+                               use_fontset = FALSE;
                }
        } else
                use_fontset = FALSE;