ISO8859-1 is CP28591, not CP1252.

2007-11-26  Tor Lillqvist  <tml@novell.com>

	* glib/win_iconv.c: ISO8859-1 is CP28591, not CP1252.

svn path=/trunk/; revision=5939

diff --git a/ChangeLog b/ChangeLog
index 9271cfb..9e864ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-26  Tor Lillqvist  <tml@novell.com>
 
+       * glib/win_iconv.c: ISO8859-1 is CP28591, not CP1252.
+
+2007-11-26  Tor Lillqvist  <tml@novell.com>
+
        Implement #491549: On Windows, always use the native API for
        character set conversions instead of GNU libiconv. Almost all
        codesets supported by GNU libiconv exist as Windows codepages.

diff --git a/glib/win_iconv.c b/glib/win_iconv.c
index 90fdf28..e61eb0d 100644 (file)
--- a/glib/win_iconv.c
+++ b/glib/win_iconv.c
@@ -225,14 +225,14 @@ static struct {
     /* !IsValidCodePage(819) */\r
     {1252, "CP819"},\r
     {1252, "IBM819"},\r
-    {1252, "ISO-8859-1"},\r
-    {1252, "ISO-IR-100"},\r
-    {1252, "ISO8859-1"},\r
-    {1252, "ISO_8859-1"},\r
-    {1252, "ISO_8859-1:1987"},\r
-    {1252, "L1"},\r
-    {1252, "LATIN1"},\r
-    {1252, "CSISOLATIN1"},\r
+    {28591, "ISO-8859-1"},\r
+    {28591, "ISO-IR-100"},\r
+    {28591, "ISO8859-1"},\r
+    {28591, "ISO_8859-1"},\r
+    {28591, "ISO_8859-1:1987"},\r
+    {28591, "L1"},\r
+    {28591, "LATIN1"},\r
+    {28591, "CSISOLATIN1"},\r
 \r
     {1250, "CP1250"},\r
     {1250, "MS-EE"},\r