From: Paul Mangan <paul@claws-mail.org>
Date: Wed, 2 May 2007 07:47:38 +0000 (+0000)
Subject: 2007-05-02 [paul]	2.9.1cvs36
X-Git-Tag: rel_2_10_0~93
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=83d1bd82e36161c8945bfb548f5bc42ce908c7d5;hp=31242837ba4c59b83415e37882feac48551e5f34

2007-05-02 [paul]	2.9.1cvs36

	* src/folder.c
	* src/common/defs.h
		rename cache and mark files
		(data is preserved)
---

diff --git a/ChangeLog b/ChangeLog
index 4a289fbd8..a3bd7a5e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-02 [paul]	2.9.1cvs36
+
+	* src/folder.c
+	* src/common/defs.h
+		rename cache and mark files
+		(data is preserved)
+
 2007-04-30 [paul]	2.9.1cvs35
 
 	* manual/glossary.xml
diff --git a/PATCHSETS b/PATCHSETS
index bf7626969..b6034b45d 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2563,3 +2563,4 @@
 ( cvs diff -u -r 1.61.2.62 -r 1.61.2.63 src/account.c;  cvs diff -u -r 1.56.2.51 -r 1.56.2.52 src/pop.c;  cvs diff -u -r 1.105.2.94 -r 1.105.2.95 src/prefs_account.c;  cvs diff -u -r 1.49.2.27 -r 1.49.2.28 src/prefs_account.h;  ) > 2.9.1cvs33.patchset
 ( cvs diff -u -r 1.274.2.187 -r 1.274.2.188 src/mainwindow.c;  cvs diff -u -r 1.654.2.2617 -r 1.654.2.2618 configure.ac;  ) > 2.9.1cvs34.patchset
 ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 manual/glossary.xml;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 manual/plugins.xml;  ) > 2.9.1cvs35.patchset
+( cvs diff -u -r 1.213.2.143 -r 1.213.2.144 src/folder.c;  cvs diff -u -r 1.9.2.36 -r 1.9.2.37 src/common/defs.h;  ) > 2.9.1cvs36.patchset
diff --git a/configure.ac b/configure.ac
index 31d71ab2f..df557333e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/defs.h b/src/common/defs.h
index 63e04892d..1f966d362 100644
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -90,8 +90,10 @@
 #define RELEASE_NOTES_FILE	"RELEASE_NOTES"
 #define THEMEINFO_FILE		".claws_themeinfo"
 #define FOLDER_LIST		"folderlist.xml"
-#define CACHE_FILE		".sylpheed_claws_cache"
-#define MARK_FILE		".sylpheed_mark"
+#define OLD_CACHE_FILE		".sylpheed_claws_cache"
+#define CACHE_FILE		".claws_cache"
+#define OLD_MARK_FILE		".sylpheed_mark"
+#define MARK_FILE		".claws_mark"
 #define CACHE_VERSION		24
 #define MARK_VERSION		2
 
diff --git a/src/folder.c b/src/folder.c
index 438743acd..b2a17dc22 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -3434,6 +3434,7 @@ static gchar *folder_item_get_cache_file(FolderItem *item)
 {
 	gchar *path;
 	gchar *file;
+	gchar *old_file;
 
 	g_return_val_if_fail(item != NULL, NULL);
 	g_return_val_if_fail(item->path != NULL, NULL);
@@ -3443,6 +3444,11 @@ static gchar *folder_item_get_cache_file(FolderItem *item)
 	if (!is_dir_exist(path))
 		make_dir_hier(path);
 	file = g_strconcat(path, G_DIR_SEPARATOR_S, CACHE_FILE, NULL);
+	old_file = g_strconcat(path, G_DIR_SEPARATOR_S, OLD_CACHE_FILE, NULL);
+
+	if (!is_file_exist(file) && is_file_exist(old_file))
+		move_file(old_file, file, FALSE);
+	g_free(old_file);
 	g_free(path);
 
 	return file;
@@ -3452,6 +3458,7 @@ static gchar *folder_item_get_mark_file(FolderItem *item)
 {
 	gchar *path;
 	gchar *file;
+	gchar *old_file;
 
 	g_return_val_if_fail(item != NULL, NULL);
 	g_return_val_if_fail(item->path != NULL, NULL);
@@ -3461,6 +3468,11 @@ static gchar *folder_item_get_mark_file(FolderItem *item)
 	if (!is_dir_exist(path))
 		make_dir_hier(path);
 	file = g_strconcat(path, G_DIR_SEPARATOR_S, MARK_FILE, NULL);
+	old_file = g_strconcat(path, G_DIR_SEPARATOR_S, OLD_MARK_FILE, NULL);
+
+	if (!is_file_exist(file) && is_file_exist(old_file))
+		move_file(old_file, file, FALSE);
+	g_free(old_file);
 	g_free(path);
 
 	return file;