From bdbb9b83237eb4c9f849cea51c24972500654fd0 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 26 Nov 2007 00:50:24 +0000 Subject: [PATCH] ISO8859-1 is CP28591, not CP1252. 2007-11-26 Tor Lillqvist * glib/win_iconv.c: ISO8859-1 is CP28591, not CP1252. svn path=/trunk/; revision=5939 --- ChangeLog | 4 ++++ glib/win_iconv.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9271cfb..9e864ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-11-26 Tor Lillqvist + * glib/win_iconv.c: ISO8859-1 is CP28591, not CP1252. + +2007-11-26 Tor Lillqvist + 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 --- a/glib/win_iconv.c +++ b/glib/win_iconv.c @@ -225,14 +225,14 @@ static struct { /* !IsValidCodePage(819) */ {1252, "CP819"}, {1252, "IBM819"}, - {1252, "ISO-8859-1"}, - {1252, "ISO-IR-100"}, - {1252, "ISO8859-1"}, - {1252, "ISO_8859-1"}, - {1252, "ISO_8859-1:1987"}, - {1252, "L1"}, - {1252, "LATIN1"}, - {1252, "CSISOLATIN1"}, + {28591, "ISO-8859-1"}, + {28591, "ISO-IR-100"}, + {28591, "ISO8859-1"}, + {28591, "ISO_8859-1"}, + {28591, "ISO_8859-1:1987"}, + {28591, "L1"}, + {28591, "LATIN1"}, + {28591, "CSISOLATIN1"}, {1250, "CP1250"}, {1250, "MS-EE"}, -- 2.7.4