fixed some character corruption with ...utf8 locale string.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2004 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 02f0d104..aa9b887b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-06-05
 
+	* libsylph/codeconv.c: conv_get_locale_charset(): recognize "utf8"
+	  in locale strings as UTF-8 (fixes some character corruption).
+
+2008-06-05
+
 	* libsylph/procmime.c: procmime_scan_encoding(): fixed
 	  Content-Transfer-Encoding with comments.
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index e053d068..1d8665ee 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2008-06-05
 
+	* libsylph/codeconv.c: conv_get_locale_charset(): ロケール文字列中の
+	  "utf8" を UTF-8 として認識するようにした(一部の文字化けを修正)。
+
+2008-06-05
+
 	* libsylph/procmime.c: procmime_scan_encoding(): コメント付きの
 	  Content-Transfer-Encoding を修正。
 
diff --git a/libsylph/codeconv.c b/libsylph/codeconv.c
index 194c245e..6408372d 100644
--- a/libsylph/codeconv.c
+++ b/libsylph/codeconv.c
@@ -1898,7 +1898,7 @@ 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;
 	}