2004-11-23 [colin] 0.9.12cvs162

	* src/msgcache.c
		HEAD needs this leak fix too

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 81f21507436991eb4d655a7ad3f3eab4c2a9e7e9..a0615d09a29fe476e2f3f582fa688181caf865f6 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-11-23 [colin]     0.9.12cvs162
+
+       * src/msgcache.c
+               HEAD needs this leak fix too
+
 2004-11-22 [luke]      0.9.12cvs161
 
        * src/gtk/gtkstext.c

diff --git a/PATCHSETS b/PATCHSETS
index ed0ab846c46f6f7022abab40c75aab14d1610c1e..a24b38e81ccc3761f2354f54c0715683a92e5da5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -144,3 +144,4 @@
 ( cvs diff -u -r 1.231 -r 1.232 src/prefs_common.c; ) > 0.9.12cvs159.patchset
 ( cvs diff -u -r 1.6 -r 1.7 src/prefs_themes.c; ) > 0.9.12cvs160.patchset
 ( cvs diff -u -r 1.6 -r 1.7 src/gtk/gtkstext.c; ) > 0.9.12cvs161.patchset
+( cvs diff -u -r 1.27 -r 1.28 src/msgcache.c; ) > 0.9.12cvs162.patchset

diff --git a/configure.ac b/configure.ac
index e25162196cd757d0782473ecbe03eaec71143d2a..90b53e0b307bd31e859c26304cd981438c203a84 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=161
+EXTRA_VERSION=162
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/msgcache.c b/src/msgcache.c
index 75c8f7a8a094fa1bab2fd8f197e415a958620c2a..d3bd1624cdbaa2e093a4f0905c0af478be445af5 100644 (file)
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -487,17 +487,17 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
        fclose(fp);
        g_hash_table_thaw(cache->msgnum_table);
 
-       if(error) {
-               msgcache_destroy(cache);
-               return NULL;
-       }
-
        if (conv != NULL) {
                if (conv->free != NULL)
                        conv->free(conv);
                g_free(conv);
        }
 
+       if (error) {
+               msgcache_destroy(cache);
+               return NULL;
+       }
+
        cache->last_access = time(NULL);
 
        debug_print("done. (%d items read)\n", g_hash_table_size(cache->msgnum_table));