Fix bug #591676 (MSG_QUEUED lost on restart)

by not writing cache for F_QUEUE folderitems
[is it a good fix ?]

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9856ceb5442aad85a6dede67e10272fb348b1d23..e977dccebb9d426975acbeeffe3da12bc2382d5e 100644 (file)
--- 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 ae6af8790d312fd40586f4eb346977f059a02de7..da9fa9a159f08a275ae20d02a03034e267e5ceea 100644 (file)
--- 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 5c2a96851ba50b5dea50c96da1608a54e7358320..182a718a2c8ec174ada475cce338cdc3f2c383e6 100644 (file)
--- 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);