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

diff --git a/ChangeLog b/ChangeLog
index c418f9f0b2f9599886d3c45537534d3bb56d8abc..2c1a58be448e61bc6b9ea412edf2108c06ab3643 100644 (file)
--- 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
index 75ca4b315e403ac11dbee8ca405d40a51946a358..0ed0fd3ebfb5285cc89aeb5623fdf4c12cf2ec17 100644 (file)
--- 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
index 3110912771775ae841bd056b9f4af9fb3457549d..7710d49603c3ec9a7e4fa6842e9335a8082ea891 100644 (file)
--- 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
index de193d168057f411aa0f233c553e6b111278c606..d293c9e95c371caef31ff895ee79fbe8f57e7302 100644 (file)
--- 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
index 9b953bc2db2aa54010d5023f165356724ce71427..579674126150a91122b254c5f6d829734d882b3d 100644 (file)
--- 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;