evolution-data-server r9001 - trunk/camel

[mcrha svn gnome org]

Author: mcrha
Date: Wed Jun 18 16:05:01 2008
New Revision: 9001
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9001&view=rev

Log:
2008-06-18  Milan Crha  <mcrha redhat com>

	** Fix for bug #334160

	* camel-data-cache.c: (struct _CamelDataCachePrivate),
	(data_cache_path):
	Changed the way when test the expiration of the cache.



Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-data-cache.c

Modified: trunk/camel/camel-data-cache.c
==============================================================================
--- trunk/camel/camel-data-cache.c	(original)
+++ trunk/camel/camel-data-cache.c	Wed Jun 18 16:05:01 2008
@@ -59,7 +59,6 @@
 struct _CamelDataCachePrivate {
 	CamelObjectBag *busy_bag;
 
-	int expire_inc;
 	time_t expire_last[1<<CAMEL_DATA_CACHE_BITS];
 };
 
@@ -249,8 +248,7 @@
 #endif
 		if (create)
 			g_mkdir_with_parents (dir, 0700);
-	} else if (cdc->priv->expire_inc == hash
-		   && (cdc->expire_age != -1 || cdc->expire_access != -1)) {
+	} else if (cdc->expire_age != -1 || cdc->expire_access != -1) {
 		time_t now;
 
 		dd(printf("Checking expire cycle time on dir '%s'\n", dir));
@@ -261,7 +259,6 @@
 			cdc->priv->expire_last[hash] = now;
 			data_cache_expire(cdc, dir, key, now);
 		}
-		cdc->priv->expire_inc = (cdc->priv->expire_inc + 1) & CAMEL_DATA_CACHE_MASK;
 	}
 
 	tmp = camel_file_util_safe_filename(key);