2007-02-11 [colin] 2.7.2cvs40
authorColin Leroy <colin@colino.net>
Sun, 11 Feb 2007 19:03:28 +0000 (19:03 +0000)
committerColin Leroy <colin@colino.net>
Sun, 11 Feb 2007 19:03:28 +0000 (19:03 +0000)
* src/codeconv.c
Recognize .utf8 locales as .UTF-8 ones

ChangeLog
PATCHSETS
configure.ac
src/codeconv.c

index a9d396a843aad36247a667f069a7eec0ff7e784e..21e8dc30f9a5d77c043329be1ffc7dfc2c0393c2 100644 (file)
--- 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
index 6f6ace55d41e94d005ce49d0adbde119aa899843..47c1de50da3efa33a14f233a52c2b7ab34848757 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index d13f161fc97fe717e145eccb5f9abd9291cc8693..2d140f1f8498800835285594773b41cc9302111c 100644 (file)
@@ -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=
 
index 98115012bb84f73d0bb81d2f7c709a2303f12e99..f4687200521a8ef56ba1960623dbe50d77a03a1d 100644 (file)
@@ -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;
        }