From: Colin Leroy <colin@colino.net>
Date: Thu, 29 Aug 2002 07:30:30 +0000 (+0000)
Subject: revert bug #591676 changes
X-Git-Tag: endian_last_merge~14
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=91802b2fa53bf6af234df96669b690cad7ae04ff

revert bug #591676 changes
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e977dcceb..0711312fc 100644
--- 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
diff --git a/configure.in b/configure.in
index da9fa9a15..65f87a713 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=claws6
+EXTRA_VERSION=claws7
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/main.c b/src/main.c
index 182a718a2..bbabc67a3 100644
--- 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->stype == F_QUEUE)	
-		folder_item_write_cache(item);
+	folder_item_write_cache(item);
 }
 
 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);
 
-	if (item->stype == F_QUEUE)
-		folder_item_scan(item);
-	
 	debug_print("done.\n");
 	STATUSBAR_POP(mainwin);
 	main_window_cursor_normal(mainwin);