revert bug #591676 changes

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e977dccebb9d426975acbeeffe3da12bc2382d5e..0711312fc83bdccddbd942bd229c5def94818ad6 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-08-29 [colin]     0.8.2claws7
+
+       * src/main.c
+               Revert claws6 changes regarding bug #591676
+

 2002-08-28 [colin]     0.8.2claws6
        
        * src/main.c
 2002-08-28 [colin]     0.8.2claws6
        
        * src/main.c

diff --git a/configure.in b/configure.in
index da9fa9a159f08a275ae20d02a03034e267e5ceea..65f87a713409711da034761d9a79174a9ff84399 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws6
+EXTRA_VERSION=claws7

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/main.c b/src/main.c
index 182a718a2c8ec174ada475cce338cdc3f2c383e6..bbabc67a3bee50cd64f2fa2e10b245fc4eb07940 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -451,8 +451,7 @@ static void save_all_caches(FolderItem *item, gpointer data)
 {
        if (!item->cache)
                return;
 {
        if (!item->cache)
                return;

-       if (!item->stype == F_QUEUE)    
-               folder_item_write_cache(item);
+       folder_item_write_cache(item);

 }
 
 static void initial_processing(FolderItem *item, gpointer data)
 }
 
 static void initial_processing(FolderItem *item, gpointer data)


@@ -472,9 +471,6 @@ static void initial_processing(FolderItem *item, gpointer data)
        
        folder_item_apply_processing(item);
 
        
        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);
        debug_print("done.\n");
        STATUSBAR_POP(mainwin);
        main_window_cursor_normal(mainwin);