From: Colin Leroy <colin@colino.net>
Date: Sun, 11 Feb 2007 19:03:28 +0000 (+0000)
Subject: 2007-02-11 [colin]	2.7.2cvs40
X-Git-Tag: rel_2_8_0~37
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=67cb9e0e755dcee3bdba28fc1ba22811e15cee74

2007-02-11 [colin]	2.7.2cvs40

	* src/codeconv.c
		Recognize .utf8 locales as .UTF-8 ones
---

diff --git a/ChangeLog b/ChangeLog
index a9d396a84..21e8dc30f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-11 [colin]	2.7.2cvs40
+
+	* src/codeconv.c
+		Recognize .utf8 locales as .UTF-8 ones
+
 2007-02-11 [colin]	2.7.2cvs39
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index 6f6ace55d..47c1de50d 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2357,3 +2357,4 @@
 ( cvs diff -u -r 1.13.2.30 -r 1.13.2.31 src/plugins/clamav/clamav_plugin.c;  ) > 2.7.2cvs37.patchset
 ( cvs diff -u -r 1.13.2.31 -r 1.13.2.32 src/plugins/clamav/clamav_plugin.c;  ) > 2.7.2cvs38.patchset
 ( cvs diff -u -r 1.382.2.359 -r 1.382.2.360 src/compose.c;  ) > 2.7.2cvs39.patchset
+( cvs diff -u -r 1.65.2.56 -r 1.65.2.57 src/codeconv.c;  ) > 2.7.2cvs40.patchset
diff --git a/configure.ac b/configure.ac
index d13f161fc..2d140f1f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/codeconv.c b/src/codeconv.c
index 98115012b..f46872005 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1254,7 +1254,8 @@ static CharSet conv_get_locale_charset(void)
 		return cur_charset;
 	}
 
-	if (strcasestr(cur_locale, "UTF-8")) {
+	if (strcasestr(cur_locale, ".UTF-8") ||
+	    strcasestr(cur_locale, ".utf8")) {
 		cur_charset = C_UTF_8;
 		return cur_charset;
 	}