From: Colin Leroy <colin@colino.net>
Date: Sun, 23 Apr 2006 18:19:38 +0000 (+0000)
Subject: 2006-04-23 [colin]	2.1.1cvs28
X-Git-Tag: rel_2_2_0~25
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=9fc026c0a83344e4863ae9c44992f36316115479

2006-04-23 [colin]	2.1.1cvs28

	* src/folder.c
		Never free current's cache to free up
		memory. Fixes bug #912 (new count
		randomly set to message count)
---

diff --git a/ChangeLog b/ChangeLog
index 9fcfb8c52..a9ca949c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-23 [colin]	2.1.1cvs28
+
+	* src/folder.c
+		Never free current's cache to free up 
+		memory. Fixes bug #912 (new count 
+		randomly set to message count)
+
 2006-04-23 [colin]	2.1.1cvs27
 
 	* src/gtk/quicksearch.c
diff --git a/PATCHSETS b/PATCHSETS
index 37ab86878..7203be5de 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1449,3 +1449,4 @@
 ( cvs diff -u -r 1.179.2.108 -r 1.179.2.109 src/imap.c;  ) > 2.1.1cvs25.patchset
 ( cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/gtk/quicksearch.c;  ) > 2.1.1cvs26.patchset
 ( cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/gtk/quicksearch.c;  ) > 2.1.1cvs27.patchset
+( cvs diff -u -r 1.213.2.88 -r 1.213.2.89 src/folder.c;  ) > 2.1.1cvs28.patchset
diff --git a/configure.ac b/configure.ac
index e7cbca915..6bb6d24d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.c b/src/folder.c
index c54e4c814..6052714d1 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -2022,7 +2022,7 @@ void folder_find_expired_caches(FolderItem *item, gpointer data)
 	difftime = (gint) (time(NULL) - msgcache_get_last_access_time(item->cache));
 	expiretime = prefs_common.cache_min_keep_time * 60;
 	debug_print("Cache unused time: %d (Expire time: %d)\n", difftime, expiretime);
-	if (difftime > expiretime) {
+	if (difftime > expiretime && !item->opened && !item->processing_pending) {
 		*folder_item_list = g_slist_insert_sorted(*folder_item_list, item, folder_cache_time_compare_func);
 	}
 }