talons

commit 205b490083a141586c390bd985a3e22e99ea137d
parent af9e33f3eba97c1e6ecc222b462fcbea06d3e3a7
Author: Paul Mangan <paul@claws-mail.org>
Date:   Mon, 21 Jan 2013 17:11:25 +0000

2013-01-21 [paul]	3.9.0cvs57

	* src/codeconv.h
	* src/procmime.c
		fix bug 2862, 'Segmentation fault when replying to a
		message where the "code conversion" fails'. add support
		for X-VIET-VPS encoding

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/codeconv.h
 | 
1
+
M
src/procmime.c
 | 
2
++

5 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-21 [paul]	3.9.0cvs57
+
+	* src/codeconv.h
+	* src/procmime.c
+		fix bug 2862, 'Segmentation fault when replying to a
+		message where the "code conversion" fails'. add support
+		for X-VIET-VPS encoding
+
 2013-01-21 [paul]	3.9.0cvs56
 
 	* src/common/defs.h
diff --git a/PATCHSETS b/PATCHSETS
@@ -4554,3 +4554,4 @@
 ( cvs diff -u -r 1.9.2.83 -r 1.9.2.84 src/gtk/gtkaspell.c;  ) > 3.9.0cvs54.patchset
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 doc/man/claws-mail.1;  cvs diff -u -r 1.4.2.87 -r 1.4.2.88 src/gtk/about.c;  ) > 3.9.0cvs55.patchset
 ( cvs diff -u -r 1.9.2.61 -r 1.9.2.62 src/common/defs.h;  cvs diff -u -r 1.4.2.88 -r 1.4.2.89 src/gtk/about.c;  ) > 3.9.0cvs56.patchset
+( cvs diff -u -r 1.15.2.29 -r 1.15.2.30 src/codeconv.h;  cvs diff -u -r 1.49.2.154 -r 1.49.2.155 src/procmime.c;  ) > 3.9.0cvs57.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=56
+EXTRA_VERSION=57
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/codeconv.h b/src/codeconv.h
@@ -168,6 +168,7 @@ struct _CodeConverter
 #define CS_WINDOWS_874		"Windows-874"
 #define CS_GEORGIAN_PS		"GEORGIAN-PS"
 #define CS_TCVN5712_1		"TCVN5712-1"
+#define CS_X_VIET_VPS		"X-VIET-VPS"
 
 #define C_INTERNAL		C_UTF_8
 #define CS_INTERNAL		CS_UTF_8
diff --git a/src/procmime.c b/src/procmime.c
@@ -768,6 +768,8 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
 		src_codeset = CS_GB18030;
 	else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_GB2312))
 		src_codeset = CS_GB18030;
+	else if (!forced_charset && src_codeset && !strcasecmp(src_codeset, CS_X_VIET_VPS))
+		src_codeset = CS_WINDOWS_874;
 
 	if (mimeinfo->type == MIMETYPE_TEXT && !g_ascii_strcasecmp(mimeinfo->subtype, "html")) {
 		SC_HTMLParser *parser;