3 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 43ccc0e5..ac1104f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-06
+
+	* src/main.c: win32: include startup directory into %PATH% for GSpawn.
+
 2005-10-05
 
 	* configure.in: support SSL on win32.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 3175f31f..c0b3638a 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2005-10-06
+
+	* src/main.c: win32: GSpawn のために起動時のディレクトリを %PATH% に
+	  含めるようにした。
+
 2005-10-05
 
 	* configure.in: win32 で SSL に対応。
diff --git a/src/main.c b/src/main.c
index 27f6b460..8537686e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -367,10 +367,21 @@ static gint get_queued_message_num(void)
 
 static void app_init(void)
 {
+#ifdef G_OS_WIN32
+	gchar *newpath;
+#endif
+
+	setlocale(LC_ALL, "");
+
 	prog_version = PROG_VERSION;
 	startup_dir = g_get_current_dir();
 
-	setlocale(LC_ALL, "");
+#ifdef G_OS_WIN32
+	/* include startup directory into %PATH% for GSpawn */
+	newpath = g_strconcat(startup_dir, ";", g_getenv("PATH"), NULL);
+	g_setenv("PATH", newpath, TRUE);
+	g_free(newpath);
+#endif
 
 	if (g_path_is_absolute(LOCALEDIR))
 		bindtextdomain(PACKAGE, LOCALEDIR);