talons

commit 936190571c9908e3df60d88ffa2ce8859d1761b6
parent bd454e2e177b7153a34bb6b7da64c2cf1bc2db67
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 27 Apr 2011 05:53:35 +0000

2011-04-27 [colin]	3.7.9cvs17

	* src/codeconv.c
		Make Windows' encoding CP1251 for ru_RU locale
		Part of bug #2397, "Gtkhtml2 viewer ignores message encoding"

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

4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-27 [colin]	3.7.9cvs17
+
+	* src/codeconv.c
+		Make Windows' encoding CP1251 for ru_RU locale
+		Part of bug #2397, "Gtkhtml2 viewer ignores message encoding"
+
 2011-04-24 [paul]	3.7.9cvs16
 
 	* manual/claws-mail-manual.xml
diff --git a/PATCHSETS b/PATCHSETS
@@ -4168,3 +4168,4 @@
 ( cvs diff -u -r 1.274.2.322 -r 1.274.2.323 src/mainwindow.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/gtk/foldersort.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/foldersort.h;  ) > 3.7.9cvs14.patchset
 ( cvs diff -u -r 1.395.2.427 -r 1.395.2.428 src/summaryview.c;  ) > 3.7.9cvs15.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/de/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/es/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/it/claws-mail-manual.xml;  ) > 3.7.9cvs16.patchset
+( cvs diff -u -r 1.65.2.72 -r 1.65.2.73 src/codeconv.c;  ) > 3.7.9cvs17.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/codeconv.c b/src/codeconv.c
@@ -1071,7 +1071,11 @@ static const struct {
 	{"ru_RU.KOI8-R"	, C_KOI8_R	, C_KOI8_R},
 	{"ru_RU.KOI8R"	, C_KOI8_R	, C_KOI8_R},
 	{"ru_RU.CP1251"	, C_WINDOWS_1251, C_KOI8_R},
+#ifdef G_OS_WIN32
+	{"ru_RU"	, C_WINDOWS_1251, C_KOI8_R},
+#else
 	{"ru_RU"	, C_ISO_8859_5	, C_KOI8_R},
+#endif
 	{"tg_TJ"	, C_KOI8_T	, C_KOI8_T},
 	{"ru_UA"	, C_KOI8_U	, C_KOI8_U},
 	{"uk_UA.CP1251"	, C_WINDOWS_1251, C_KOI8_U},