From e88baf6ddf01e45471b85ce643a45bf3400074a6 Mon Sep 17 00:00:00 2001
From: Colin Leroy <colin@colino.net>
Date: Wed, 28 Aug 2002 18:05:53 +0000
Subject: [PATCH] Fix bug #591676 (MSG_QUEUED lost on restart) by not writing
 cache for F_QUEUE folderitems [is it a good fix ?]

---
 ChangeLog.claws | 8 +++++++-
 configure.in    | 2 +-
 src/main.c      | 9 ++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9856ceb54..e977dcceb 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,10 @@
-2002-08-28 [mevlin]	0.8.2claws5
+2002-08-28 [colin]	0.8.2claws6
+	
+	* src/main.c
+		Ignore cache for queue folderitems
+		Fix bug #591676
+
+2002-08-28 [melvin]	0.8.2claws5
 
 	* README.claws
 		Fixed typos.
diff --git a/configure.in b/configure.in
index ae6af8790..da9fa9a15 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws5
+EXTRA_VERSION=claws6
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/main.c b/src/main.c
index 5c2a96851..182a718a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -449,10 +449,10 @@ static gint get_queued_message_num(void)
 
 static void save_all_caches(FolderItem *item, gpointer data)
 {
-	if(!item->cache)
+	if (!item->cache)
 		return;
-		
-	folder_item_write_cache(item);
+	if (!item->stype == F_QUEUE)	
+		folder_item_write_cache(item);
 }
 
 static void initial_processing(FolderItem *item, gpointer data)
@@ -472,6 +472,9 @@ static void initial_processing(FolderItem *item, gpointer data)
 	
 	folder_item_apply_processing(item);
 
+	if (item->stype == F_QUEUE)
+		folder_item_scan(item);
+	
 	debug_print("done.\n");
 	STATUSBAR_POP(mainwin);
 	main_window_cursor_normal(mainwin);
-- 
2.25.1