fix for config dir.

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

5 files changed, 23 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 7565a400..1ea43b42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-08-09
 
+	* src/mh.c
+	  src/main.c
+	  src/procmime.c: fix for config dir.
+
+2005-08-09
+
 	* src/folder.c
 	  src/main.c
 	  src/utils.[ch]
diff --git a/ChangeLog.ja b/ChangeLog.ja
index c4ab5c17..3cc0e785 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
 2005-08-09
 
+	* src/mh.c
+	  src/main.c
+	  src/procmime.c: 設定ディレクトリの修正。
+
+2005-08-09
+
 	* src/folder.c
 	  src/main.c
 	  src/utils.[ch]
diff --git a/src/main.c b/src/main.c
index e5adf542..0d9ef0b4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -256,23 +256,25 @@ int main(int argc, char *argv[])
 	MAKE_DIR_IF_NOT_EXIST(get_mail_base_dir());
 #endif /* G_OS_WIN32 */
 
+	CHDIR_RETURN_VAL_IF_FAIL(get_rc_dir(), 1);
+
 	MAKE_DIR_IF_NOT_EXIST(get_imap_cache_dir());
 	MAKE_DIR_IF_NOT_EXIST(get_news_cache_dir());
 	MAKE_DIR_IF_NOT_EXIST(get_mime_tmp_dir());
 	MAKE_DIR_IF_NOT_EXIST(get_tmp_dir());
-	MAKE_DIR_IF_NOT_EXIST(RC_DIR G_DIR_SEPARATOR_S UIDL_DIR);
+	MAKE_DIR_IF_NOT_EXIST(UIDL_DIR);
 
 	/* remove temporary files */
 	remove_all_files(get_tmp_dir());
 	remove_all_files(get_mime_tmp_dir());
 
-	if (is_file_exist(RC_DIR G_DIR_SEPARATOR_S "sylpheed.log")) {
-		if (rename_force
-			(RC_DIR G_DIR_SEPARATOR_S "sylpheed.log",
-			 RC_DIR G_DIR_SEPARATOR_S "sylpheed.log.bak") < 0)
+	if (is_file_exist("sylpheed.log")) {
+		if (rename_force("sylpheed.log", "sylpheed.log.bak") < 0)
 			FILE_OP_ERROR("sylpheed.log", "rename");
 	}
-	set_log_file(RC_DIR G_DIR_SEPARATOR_S "sylpheed.log");
+	set_log_file("sylpheed.log");
+
+	CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), 1);
 
 	prefs_common_read_config();
 
diff --git a/src/mh.c b/src/mh.c
index 6483e131..40554867 100644
--- a/src/mh.c
+++ b/src/mh.c
@@ -838,7 +838,7 @@ static gint mh_create_tree(Folder *folder)
 
 	g_return_val_if_fail(folder != NULL, -1);
 
-	CHDIR_RETURN_VAL_IF_FAIL(get_home_dir(), -1);
+	CHDIR_RETURN_VAL_IF_FAIL(get_mail_base_dir(), -1);
 	rootpath = LOCAL_FOLDER(folder)->rootpath;
 	MAKE_DIR_IF_NOT_EXIST(rootpath);
 	CHDIR_RETURN_VAL_IF_FAIL(rootpath, -1);
diff --git a/src/procmime.c b/src/procmime.c
index 7dcd3f89..1787aa2c 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1003,8 +1003,8 @@ static GHashTable *procmime_get_mime_type_table(void)
 			list = procmime_get_mime_type_list("/etc/mime.types");
 			mime_type_list = g_list_concat(mime_type_list, list);
 		}
-		dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, RC_DIR,
-				  G_DIR_SEPARATOR_S, "mime.types", NULL);
+		dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+				  "mime.types", NULL);
 		list = procmime_get_mime_type_list(dir);
 		g_free(dir);
 		mime_type_list = g_list_concat(mime_type_list, list);