2004-11-12 [colin] 0.9.12cvs146.2

	* src/codeconv.c
		We want to replace _all_ extended chars in
		conv_unreadable_*, because any string containing
		extended chars not parsing as UTF8 is
		undisplayed on gtk2.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index e223cc6562a114d52d79d5b310a9e85540a482dd..deb2385f6fc76af72fb256883aa9ec16107350c6 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2004-11-12 [colin]     0.9.12cvs146.2
+
+       * src/codeconv.c
+               We want to replace _all_ extended chars in
+               conv_unreadable_*, because any string containing
+               extended chars not parsing as UTF8 is 
+               undisplayed on gtk2.
+
 2004-11-12 [paul]      0.9.12cvs146.1
 
        * ChangeLog

diff --git a/PATCHSETS b/PATCHSETS
index bf5744ca43dc82fbe4f337df899c7ac522f28eb9..22a6f38bdd3557368298c5cd6ad72007cea67dce 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -226,3 +226,4 @@
 ( cvs diff -u -r 1.2504.2.30 -r 1.2504.2.31 ChangeLog.claws; cvs diff -u -r 1.382.2.61 -r 1.382.2.62 src/compose.c; cvs diff -u -r 1.213.2.19 -r 1.213.2.20 src/folder.c; cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/folder_item_prefs.c; cvs diff -u -r 1.105.2.10 -r 1.105.2.11 src/prefs_account.c; cvs diff -u -r 1.49.2.5 -r 1.49.2.6 src/prefs_account.h; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs144.1.patchset
 ( cvs diff -u -r 1.96.2.30 -r 1.96.2.31 src/textview.c; ) > 0.9.12cvs144.2.patchset
 ( cvs diff -u -r 1.396.2.11 -r 1.396.2.12 ChangeLog; cvs diff -u -r 1.2504.2.31 -r 1.2504.2.32 ChangeLog.claws; cvs diff -u -r 1.391.2.11 -r 1.391.2.12 ChangeLog.jp; cvs diff -u -r 1.42.2.3 -r 1.42.2.4 NEWS; cvs diff -u -r 1.654.2.259 -r 1.654.2.260 configure.ac; cvs diff -u -r 1.61.2.14 -r 1.61.2.15 src/account.c; cvs diff -u -r 1.207.2.20 -r 1.207.2.21 src/folderview.c; cvs diff -u -r 1.20.2.2 -r 1.20.2.3 src/folderview.h; cvs diff -u -r 1.179.2.10 -r 1.179.2.11 src/imap.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/imap_gtk.c; cvs diff -u -r 1.149.2.16 -r 1.149.2.17 src/inc.c; cvs diff -u -r 1.274.2.22 -r 1.274.2.23 src/mainwindow.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/mh_gtk.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/news_gtk.c; cvs diff -u -r 1.56.2.27 -r 1.56.2.28 src/pop.c; cvs diff -u -r 1.105.2.11 -r 1.105.2.12 src/prefs_account.c; cvs diff -u -r 1.49.2.6 -r 1.49.2.7 src/prefs_account.h; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/prefs_ext_prog.c; cvs diff -u -r 1.49.2.18 -r 1.49.2.19 src/procmime.c; cvs diff -u -r 1.17.2.6 -r 1.17.2.7 src/procmime.h; cvs diff -u -r 1.150.2.11 -r 1.150.2.12 src/procmsg.c; cvs diff -u -r 1.60.2.8 -r 1.60.2.9 src/procmsg.h; cvs diff -u -r 1.15.2.10 -r 1.15.2.11 src/summary_search.c; cvs diff -u -r 1.395.2.38 -r 1.395.2.39 src/summaryview.c; cvs diff -u -r 1.96.2.31 -r 1.96.2.32 src/textview.c; cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/common/defs.h; cvs diff -u -r 1.36.2.13 -r 1.36.2.14 src/common/utils.c; cvs diff -u -r 1.20.2.9 -r 1.20.2.10 src/common/utils.h; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/gtk/menu.c; cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/gtk/menu.h; ) > 0.9.12cvs146.1.patchset
+( cvs diff -u -r 1.65.2.17 -r 1.65.2.18 src/codeconv.c; ) > 0.9.12cvs146.2.patchset

diff --git a/configure.ac b/configure.ac
index 453214a91315401c6a576fa4801995162f0aec78..461052df79c2d4486e924c29ecff38d27f31adcb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=146
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/codeconv.c b/src/codeconv.c
index c8bec283074d6e1b7cbc8e866331d944d90422f4..18d91d669e0c83c2b95cc9785aabb26dad4727e9 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -568,7 +568,7 @@ void conv_unreadable_latin(gchar *str)
                /* convert CR+LF -> LF */
                if (*p == '\r' && *(p + 1) == '\n')
                        memmove(p, p + 1, strlen(p));
-               else if ((*p & 0xff) >= 0x7f && (*p & 0xff) <= 0x9f)
+               else if ((*p & 0xff) >= 0x7f)
                        *p = SUBST_CHAR;
                p++;
        }
@@ -577,17 +577,18 @@ void conv_unreadable_latin(gchar *str)
 void conv_unreadable_utf8(gchar *str)
 {
        register guchar *p = str;
-
+printf("in %s\n", str);
        while (*p != '\0') {
                /* convert CR+LF -> LF */
-
+printf("p %x(%c) - %x\n",*p, *p, (*p & 0xff));
                if (*p == '\r' && *(p + 1) == '\n')
                        memmove(p, p + 1, strlen(p));
-               else if (((*p & 0xff) >= 0x7f && (*p & 0xff) <= 0x9f) 
+               else if (((*p & 0xff) >= 0x7f) 
                         || *p == 0xfc)
                        *p = SUBST_CHAR;
                p++;
        }
+printf("out %s\n", str);
 }
 
 void conv_unreadable_locale(gchar *str)