CVS: sylpheed-claws/src folder.c,1.213.2.89,1.213.2.90 folder.h,1.87.2.26,1.87.2.27 folderview.c,1.207.2.96,1.207.2.97

Update of /cvsroot/sylpheed-claws/sylpheed-claws/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20482/src

Modified Files:
      Tag: gtk2
	folder.c folder.h folderview.c 
Log Message:
2006-04-25 [paul]	2.1.1cvs33

	* src/folder.c
	* src/folder.h
	* src/folderview.c
		complete the fix of bug #912
		Thanks to Colin 

Index: folder.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/folder.c,v
retrieving revision 1.213.2.89
retrieving revision 1.213.2.90
diff -u -r1.213.2.89 -r1.213.2.90
--- folder.c	23 Apr 2006 18:19:37 -0000	1.213.2.89
+++ folder.c	25 Apr 2006 08:00:00 -0000	1.213.2.90
@@ -2050,13 +2050,13 @@
 	prefs_common.cache_max_mem_usage = 0;
 	prefs_common.cache_min_keep_time = 0;
 
-	folder_clean_cache_memory();
+	folder_clean_cache_memory(NULL);
 
 	prefs_common.cache_max_mem_usage = old_cache_max_mem_usage;
 	prefs_common.cache_min_keep_time = old_cache_min_keep_time;
 }
 
-void folder_clean_cache_memory(void)
+void folder_clean_cache_memory(FolderItem *protected_item)
 {
 	gint memusage = 0;
 
@@ -2072,7 +2072,8 @@
 		listitem = folder_item_list;
 		while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
 			FolderItem *item = (FolderItem *)(listitem->data);
-
+			if (item == protected_item)
+				continue;
 			debug_print("Freeing cache memory for %s\n", item->path ? item->path : item->name);
 			memusage -= msgcache_get_memory_usage(item->cache);
 		        folder_item_free_cache(item);
@@ -2130,7 +2131,7 @@
 		item->cache = msgcache_new();
 	}
 
-	folder_clean_cache_memory();
+	folder_clean_cache_memory(item);
 }
 
 void folder_item_write_cache(FolderItem *item)

Index: folder.h
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/folder.h,v
retrieving revision 1.87.2.26
retrieving revision 1.87.2.27
diff -u -r1.87.2.26 -r1.87.2.27
--- folder.h	7 Mar 2006 09:55:13 -0000	1.87.2.26
+++ folder.h	25 Apr 2006 08:00:00 -0000	1.87.2.27
@@ -798,7 +798,7 @@
 					(GHashTable *pptable, const char *name);
 
 void folder_item_restore_persist_prefs	(FolderItem *item, GHashTable *pptable);
-void folder_clean_cache_memory		(void);
+void folder_clean_cache_memory		(FolderItem *protected_item);
 void folder_clean_cache_memory_force	(void);
 void folder_item_write_cache		(FolderItem *item);
 void folder_item_set_default_flags	(FolderItem *dest, MsgFlags *flags);

Index: folderview.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/folderview.c,v
retrieving revision 1.207.2.96
retrieving revision 1.207.2.97
diff -u -r1.207.2.96 -r1.207.2.97
--- folderview.c	21 Apr 2006 16:52:17 -0000	1.207.2.96
+++ folderview.c	25 Apr 2006 08:00:00 -0000	1.207.2.97
@@ -1969,7 +1969,7 @@
 	summary_set_prefs_from_folderitem(folderview->summaryview, item);
 	opened = summary_show(folderview->summaryview, item);
 	
-	folder_clean_cache_memory();
+	folder_clean_cache_memory(item);
 
 	if (!opened) {
 		gtkut_ctree_set_focus_row(ctree, folderview->opened);



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642