From a8a42c8b15f38302939c9b7b198d59be29805cb2 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 5 Dec 2007 07:14:19 +0000 Subject: [PATCH] Add "shift-jis" as an alternative spelling of "shift_jis". 2007-12-05 Tor Lillqvist * glib/win_iconv.c: Add "shift-jis" as an alternative spelling of "shift_jis". svn path=/trunk/; revision=6047 --- ChangeLog | 5 +++++ glib/win_iconv.c | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 89586f6ca..7bdb60cdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-05 Tor Lillqvist + + * glib/win_iconv.c: Add "shift-jis" as an alternative spelling of + "shift_jis". + 2007-12-05 Ryan Lortie * autogen.sh: for the benefit of git users, checkout build/ if it is diff --git a/glib/win_iconv.c b/glib/win_iconv.c index 7fb1da2a6..5cedbcc7d 100644 --- a/glib/win_iconv.c +++ b/glib/win_iconv.c @@ -437,6 +437,7 @@ static struct { {874, "windows-874"}, /* ANSI/OEM Thai (same as 28605, ISO 8859-15); Thai (Windows) */ {875, "cp875"}, /* IBM EBCDIC Greek Modern */ {932, "shift_jis"}, /* ANSI/OEM Japanese; Japanese (Shift-JIS) */ + {932, "shift-jis"}, /* alternative name for it */ {936, "gb2312"}, /* ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312) */ {949, "ks_c_5601-1987"}, /* ANSI/OEM Korean (Unified Hangul Code) */ {950, "big5"}, /* ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5) */