summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2002-09-10 11:37:34 +0000
committerMichael Zucci <zucchi@src.gnome.org>2002-09-10 11:37:34 +0000
commita599ca2c81cfcc597041509ca81f8705a5ca8f30 (patch)
treedd8aa7d764603aa2c09df1db43c449cf0193d37c
parent58c169747158713cc0979ca4fffda665cbc33d07 (diff)
downloadevolution-data-server-a599ca2c81cfcc597041509ca81f8705a5ca8f30.tar.gz
Remove the hash table entry using the right path. Related to #29731.
2002-09-10 Not Zed <NotZed@Ximian.com> * camel-data-cache.c (data_cache_expire): Remove the hash table entry using the right path. Related to #29731. (camel_data_cache_remove): "
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-data-cache.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index c9d13ddd2..508c2c932 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-10 Not Zed <NotZed@Ximian.com>
+
+ * camel-data-cache.c (data_cache_expire): Remove the hash table
+ entry using the right path. Related to #29731.
+ (camel_data_cache_remove): "
+
2002-09-09 Jeffrey Stedfast <fejj@ximian.com>
Fixes bug #4224
diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c
index 91ab7f058..04c9650bd 100644
--- a/camel/camel-data-cache.c
+++ b/camel/camel-data-cache.c
@@ -250,7 +250,7 @@ data_cache_expire(CamelDataCache *cdc, const char *path, const char *keep, time_
dd(printf("Has expired! Removing!\n"));
unlink(s->str);
if (g_hash_table_lookup_extended(cdc->priv->busy_path, s->str, (void **)&oldpath, (void **)&stream)) {
- g_hash_table_remove(cdc->priv->busy_path, path);
+ g_hash_table_remove(cdc->priv->busy_path, oldpath);
g_hash_table_remove(cdc->priv->busy_stream, stream);
g_free(oldpath);
}
@@ -432,7 +432,7 @@ camel_data_cache_remove(CamelDataCache *cdc, const char *path, const char *key,
real = data_cache_path(cdc, FALSE, path, key);
if (g_hash_table_lookup_extended(cdc->priv->busy_path, real, (void **)&oldpath, (void **)&stream)) {
- g_hash_table_remove(cdc->priv->busy_path, path);
+ g_hash_table_remove(cdc->priv->busy_path, oldpath);
g_hash_table_remove(cdc->priv->busy_stream, stream);
g_free(oldpath);
}