win32: convert locale string to UTF-8 when setting rc dir.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@686 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 23 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c9bc416c..78d756ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-26
+
+	* src/main.c: win32: convert locale string to UTF-8 when setting
+	  rc dir.
+
 2005-10-25
 
 	* src/messageview.c
diff --git a/ChangeLog.ja b/ChangeLog.ja
index e9c92a1e..94dd4b8c 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2005-10-26
+
+	* src/main.c: win32: rc dir を設定するときはロケール文字列を UTF-8
+	  に変換するようにした。
+
 2005-10-25
 
 	* src/messageview.c
diff --git a/src/main.c b/src/main.c
index d1320ac0..580652f7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -340,8 +340,20 @@ static void parse_cmd_opt(int argc, char *argv[])
 
 			if (p && *p != '\0' && *p != '-') {
 				/* this must only be done at startup */
-				cmd.configdir = TRUE;
+#ifdef G_OS_WIN32
+				gchar *utf8dir;
+
+				utf8dir = g_locale_to_utf8
+					(p, -1, NULL, NULL, NULL);
+				if (utf8dir) {
+					set_rc_dir(utf8dir);
+					g_free(utf8dir);
+				} else
+					set_rc_dir(p);
+#else
 				set_rc_dir(p);
+#endif
+				cmd.configdir = TRUE;
 				i++;
 			}
 		} else if (!strncmp(argv[i], "--help", 6)) {