diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-08-07 07:40:39 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-08-07 07:40:39 +0000 |
| commit | 9689e0699f2dc4074fcae3009a67afe3c4e260c0 (patch) | |
| tree | b42df9d05fee85c0c7c281a6a3231e519d113e88 | |
| parent | 3c7939dce9e5183999e0923d8dbd2a9c85ace112 (diff) | |
some fixes for Win32.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@474 ee746299-78ed-0310-b773-934348b2243d
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.ja | 4 | ||||
| -rw-r--r-- | src/codeconv.c | 8 |
3 files changed, 16 insertions, 0 deletions
@@ -1,5 +1,9 @@ 2005-08-07 + * src/codeconv.c: some fixes for Win32. + +2005-08-07 + * src/procmsg.c: procmsg_send_queue(): close queue file before removing it (Win32 fix). diff --git a/ChangeLog.ja b/ChangeLog.ja index 7a7e8a57..202078b9 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,9 @@ 2005-08-07 + * src/codeconv.c: Win32 向けのいくつかの修正。 + +2005-08-07 + * src/procmsg.c: procmsg_send_queue(): キューファイルを消去する前に 閉じるようにした(Win32 fix)。 diff --git a/src/codeconv.c b/src/codeconv.c index c135b19c..470b5e13 100644 --- a/src/codeconv.c +++ b/src/codeconv.c @@ -1214,7 +1214,11 @@ static const struct { {"ja_JP.ujis" , C_EUC_JP , C_ISO_2022_JP}, {"ja_JP.SJIS" , C_SHIFT_JIS , C_ISO_2022_JP}, {"ja_JP.JIS" , C_ISO_2022_JP , C_ISO_2022_JP}, +#ifdef G_OS_WIN32 + {"ja_JP" , C_SHIFT_JIS , C_ISO_2022_JP}, +#else {"ja_JP" , C_EUC_JP , C_ISO_2022_JP}, +#endif {"ko_KR.EUC-KR" , C_EUC_KR , C_EUC_KR}, {"ko_KR" , C_EUC_KR , C_EUC_KR}, {"zh_CN.GB2312" , C_GB2312 , C_GB2312}, @@ -1594,10 +1598,14 @@ const gchar *conv_get_current_locale(void) static const gchar *cur_locale; if (!cur_locale) { +#ifdef G_OS_WIN32 + cur_locale = g_win32_getlocale(); +#else cur_locale = g_getenv("LC_ALL"); if (!cur_locale) cur_locale = g_getenv("LC_CTYPE"); if (!cur_locale) cur_locale = g_getenv("LANG"); if (!cur_locale) cur_locale = setlocale(LC_CTYPE, NULL); +#endif /* G_OS_WIN32 */ debug_print("current locale: %s\n", cur_locale ? cur_locale : "(none)"); |