From: Colin Leroy <colin@colino.net>
Date: Tue, 27 Jul 2004 19:57:57 +0000 (+0000)
Subject: better fix
X-Git-Tag: gtk2_win32_last_merge~276
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=572ba4e64041de3cb0703fa6a9e0f766dd24ead0

better fix
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 865010e11..959d81b79 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-07-27 [colin]	0.9.12cvs37.1
+
+	* src/msgcache.c
+		More fixes (synced for head again)
+
 2004-07-27 [colin]	0.9.12cvs35.3
 
 	* src/msgcache.c
diff --git a/PATCHSETS b/PATCHSETS
index c6e5abe7a..8f56ff3c4 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -83,3 +83,4 @@
 ( cvs diff -u -r 1.17.2.3 -r 1.17.2.4 src/alertpanel.c; cvs diff -u -r 1.12.2.2 -r 1.12.2.3 src/passphrase.c; ) > 0.9.12cvs35.1.patchset
 ( cvs diff -u -r 1.17.2.4 -r 1.17.2.5 src/alertpanel.c; cvs diff -u -r 1.5 -r 1.6 src/alertpanel.h; cvs diff -u -r 1.3.12.2 -r 1.3.12.3 src/message_search.c; cvs diff -u -r 1.83.2.13 -r 1.83.2.14 src/mimeview.c; cvs diff -u -r 1.12.2.3 -r 1.12.2.4 src/sgpgme.c; cvs diff -u -r 1.15.2.4 -r 1.15.2.5 src/summary_search.c; ) > 0.9.12cvs35.2.patchset
 ( cvs diff -u -r 1.16.2.6 -r 1.16.2.7 src/msgcache.c; ) > 0.9.12cvs35.3.patchset
+( cvs diff -u -r 1.16.2.7 -r 1.16.2.8 src/msgcache.c; ) > 0.9.12cvs37.1.patchset
diff --git a/configure.ac b/configure.ac
index 50e739b62..1a02b44cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=37
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.3
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
diff --git a/src/msgcache.c b/src/msgcache.c
index 034910d09..3c3a0d412 100644
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -118,12 +118,13 @@ void msgcache_update_msg(MsgCache *cache, MsgInfo *msginfo)
 	oldmsginfo = g_hash_table_lookup(cache->msgnum_table, &msginfo->msgnum);
 	if(oldmsginfo && oldmsginfo->msgid) {
 		g_hash_table_remove(cache->msgid_table, oldmsginfo->msgid);
+	}
+
+	if (oldmsginfo) {
 		g_hash_table_remove(cache->msgnum_table, &oldmsginfo->msgnum);
-	} 
-	if (oldmsginfo) 
 		procmsg_msginfo_free(oldmsginfo);
-	
-	cache->memusage -= procmsg_msginfo_memusage(oldmsginfo);
+		cache->memusage -= procmsg_msginfo_memusage(oldmsginfo);
+	}
 
 	newmsginfo = procmsg_msginfo_new_ref(msginfo);
 	g_hash_table_insert(cache->msgnum_table, &newmsginfo->msgnum, newmsginfo);