From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Fri, 26 Jul 2002 20:24:58 +0000 (+0000)
Subject: * src/folder.c
X-Git-Tag: rel_0_8_1~13
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=19708ce08c0d6641f34fa7170bb8206a673f98a9

* src/folder.c
	use folder item identifier for saving / restoring
	preferences because folder->path might not be unique
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8aca0c1e0..109d41e76 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-07-26 [alfons]	0.8.0claws18
+
+	* src/folder.c
+		use folder item identifier for saving / restoring
+		preferences because folder->path might not be unique
+
 2002-07-26 [melvin]	0.8.0claws17
 
 	* src/logwindow.c
diff --git a/configure.in b/configure.in
index 2549f54c8..1e6e2a040 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws17
+EXTRA_VERSION=claws18
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/folder.c b/src/folder.c
index 2944caa5d..bf0e00342 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -2271,14 +2271,15 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
 	FolderItem *item = FOLDER_ITEM(node->data);
 	PersistPrefs *pp;
 	GNode *child, *cur;
+	gchar *id;
 
 	g_return_if_fail(node != NULL);
 	g_return_if_fail(item != NULL);
 
-	/* FIXME: item->path == NULL for top level folder, so this means that 
-	 * properties of MH folder root will not be stored. Not quite important, 
-	 * because the top level folder properties are not special anyway. */
+	/* NOTE: item->path == NULL means top level folder; not interesting
+	 * to store preferences of that one.  */
 	if (item->path) {
+		id = folder_item_get_identifier(item);
 		pp = g_new0(PersistPrefs, 1);
 		g_return_if_fail(pp != NULL);
 		pp->collapsed = item->collapsed;
@@ -2287,8 +2288,8 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
 		pp->hide_read_msgs = item->hide_read_msgs;
 		pp->sort_key  = item->sort_key;
 		pp->sort_type = item->sort_type;
-		g_hash_table_insert(pptable, g_strdup(item->path), pp);
-	}		
+		g_hash_table_insert(pptable, id, pp);
+	}
 
 	if (node->children) {
 		child = node->children;