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 9fcfb8c52689c1765ce17b821bd5416f401f953b..a9ca949c41353eb398acad44b771236d71d6c4bb 100644 (file)
--- 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 37ab868788125716a4cf1a7eeedd382aa2c2e9eb..7203be5de41dff55cfe9a81c167df42b53863b15 100644 (file)
--- 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 e7cbca9152d7570f8fff2262c268b345d6e1459c..6bb6d24d05dba2e380295229a0bffd0da3c9faee 100644 (file)
--- 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 c54e4c814f58c65315d5e6075973e714312f0870..6052714d15aa5874a4a76df82e80f1d6726f9129 100644 (file)
--- 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);
        }
 }