aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.ja5
-rw-r--r--libsylph/codeconv.c2
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c59869db..6d0dfcee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-02-08
+ * libsylph/codeconv.c: conv_get_fallback_for_private_encoding():
+ supported "x-sjis" encoding.
+
+2006-02-08
+
* libsylph/codeconv.c:
conv_get_locale_charset()
conv_get_locale_charset_str(): use GLib API on Win32 (fixes wrong
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 461dfe88..a0867ed0 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
2006-02-08
+ * libsylph/codeconv.c: conv_get_fallback_for_private_encoding():
+ "x-sjis" に対応。
+
+2006-02-08
+
* libsylph/codeconv.c:
conv_get_locale_charset()
conv_get_locale_charset_str(): Win32 では GLib API を使用するように
diff --git a/libsylph/codeconv.c b/libsylph/codeconv.c
index 59b5bd71..6cf3de66 100644
--- a/libsylph/codeconv.c
+++ b/libsylph/codeconv.c
@@ -1276,6 +1276,8 @@ conv_get_fallback_for_private_encoding(const gchar *encoding)
encoding[1] == '-') {
if (!g_ascii_strcasecmp(encoding, CS_X_GBK))
return CS_GBK;
+ else if (!g_ascii_strcasecmp(encoding, CS_X_SJIS))
+ return CS_SHIFT_JIS;
} else if ((encoding[0] == 'K' || encoding[0] == 'k') &&
(encoding[1] == 'S' || encoding[1] == 's')) {
if (!g_ascii_strcasecmp(encoding, CS_KS_C_5601_1987))