talons

commit 8ccad05c59bf973eb25a9aea903a61aff42908b9
parent e77d9be90d86066ecf0f81b6c2cb31d634e7e01e
Author: Colin Leroy <colin@colino.net>
Date:   Sat,  1 Nov 2008 20:54:32 +0000

2008-11-01 [colin]	3.6.1cvs14

	* src/codeconv.c
		Fix wrongly converted non-ascii characters
		when locale's charset is US-ASCII (strict-mode
		was failing in this case)

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/codeconv.c
 | 
3
+++

4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-01 [colin]	3.6.1cvs14
+
+	* src/codeconv.c
+		Fix wrongly converted non-ascii characters
+		when locale's charset is US-ASCII (strict-mode
+		was failing in this case)
+
 2008-10-30 [colin]	3.6.1cvs13
 
 	* src/mimeview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3595,3 +3595,4 @@
 ( cvs diff -u -r 1.2.2.7 -r 1.2.2.8 tools/kdeservicemenu/install.sh;  ) > 3.6.1cvs11.patchset
 ( cvs diff -u -r 1.25.2.27 -r 1.25.2.28 tools/Makefile.am;  diff -u /dev/null tools/kdeservicemenu/claws-mail-attach-files.desktop.kde4template;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 tools/kdeservicemenu/install.sh;  ) > 3.6.1cvs12.patchset
 ( cvs diff -u -r 1.83.2.145 -r 1.83.2.146 src/mimeview.c;  cvs diff -u -r 1.20.2.26 -r 1.20.2.27 src/mimeview.h;  cvs diff -u -r 1.96.2.208 -r 1.96.2.209 src/textview.c;  cvs diff -u -r 1.12.2.24 -r 1.12.2.25 src/textview.h;  ) > 3.6.1cvs13.patchset
+( cvs diff -u -r 1.65.2.62 -r 1.65.2.63 src/codeconv.c;  ) > 3.6.1cvs14.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/codeconv.c b/src/codeconv.c
@@ -725,6 +725,9 @@ gchar *conv_codeset_strdup(const gchar *inbuf,
 
 	src_code = conv_get_fallback_for_private_encoding(src_code);
 	conv_func = conv_get_code_conv_func(src_code, dest_code);
+	if (conv_func == conv_ustodisp && strict_mode && !is_ascii_str(inbuf))
+		return NULL;
+
 	if (conv_func != conv_noconv) {
 		len = (strlen(inbuf) + 1) * 3;
 		buf = g_malloc(len);