fix for message display in UTF-8 locales

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a14d0594847149c7fe3f3fc0eda1262ff89c4c5d..bf1218c04c0a583c5fb12b409cb43df225970653 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2002-11-22 [paul]      0.8.5claws176
+
+       * src/textview.c
+               textview_set_font(): fix for message display in
+               UTF-8 locales (thanks to Sergey Vlasov).
+               
+       * AUTHORS
+               add new team members and contributors
+
+

 2002-11-21 [colin]     0.8.5claws175
 
        * src/procmsg.[ch]
 2002-11-21 [colin]     0.8.5claws175
 
        * src/procmsg.[ch]

diff --git a/configure.in b/configure.in
index de2063dc41c77254abb0e13a61fc447ed3b9f3e5..b330e98ce20908043b5b4882dd213c66dde4c4ed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws175
+EXTRA_VERSION=claws176

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/textview.c b/src/textview.c
index 1a16f09c9c567069966b7e770dfb658c77fab928..41054fa2c2994112fb9145e9a179868fa0f78eae 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1192,7 +1192,7 @@ void textview_set_font(TextView *textview, const gchar *codeset)
        /* In multi-byte mode, GtkSText can't display 8bit characters
           correctly, so it must be single-byte mode. */
        if (MB_CUR_MAX > 1) {
        /* In multi-byte mode, GtkSText can't display 8bit characters
           correctly, so it must be single-byte mode. */
        if (MB_CUR_MAX > 1) {

-               if (codeset) {
+               if (codeset && conv_get_current_charset() != C_UTF_8) {

                        if (!g_strncasecmp(codeset, "ISO-8859-", 9) ||
                            !g_strcasecmp(codeset, "BALTIC"))
                                use_fontset = FALSE;
                        if (!g_strncasecmp(codeset, "ISO-8859-", 9) ||
                            !g_strcasecmp(codeset, "BALTIC"))
                                use_fontset = FALSE;