Add "shift-jis" as an alternative spelling of "shift_jis".

2007-12-05  Tor Lillqvist  <tml@novell.com>

	* glib/win_iconv.c: Add "shift-jis" as an alternative spelling of
	"shift_jis".

svn path=/trunk/; revision=6047

diff --git a/ChangeLog b/ChangeLog
index 89586f6..7bdb60c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-05  Tor Lillqvist  <tml@novell.com>
+
+       * glib/win_iconv.c: Add "shift-jis" as an alternative spelling of
+       "shift_jis".
+
 2007-12-05  Ryan Lortie  <desrt@desrt.ca>
 
        * 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 7fb1da2..5cedbcc 100644 (file)
--- 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) */\r
     {875, "cp875"}, /* IBM EBCDIC Greek Modern */\r
     {932, "shift_jis"}, /* ANSI/OEM Japanese; Japanese (Shift-JIS) */\r
+    {932, "shift-jis"}, /* alternative name for it */\r
     {936, "gb2312"}, /* ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312) */\r
     {949, "ks_c_5601-1987"}, /* ANSI/OEM Korean (Unified Hangul Code) */\r
     {950, "big5"}, /* ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5) */\r