From d22fe17dbd9556b6a4aa2956ca4d11522668830c Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Tue, 16 Dec 2003 21:05:32 +0000
Subject: [PATCH] 0.9.7claws47

* src/folder.c
        fix folder update before adding MsgInfo to cache
        in add_msginfo_to_cache()

* src/procmsg.c
        remove old call to folder_item_update() that is no
        longer required
---
 ChangeLog.claws | 10 ++++++++++
 configure.ac    |  2 +-
 src/folder.c    |  8 ++++----
 src/procmsg.c   |  1 -
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7d9bc4442..adeef39af 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2003-12-16 [christoph]	0.9.7claws47
+
+	* src/folder.c
+		fix folder update before adding MsgInfo to cache
+		in add_msginfo_to_cache()
+
+	* src/procmsg.c
+		remove old call to folder_item_update() that is no
+		longer required
+
 2003-12-16 [christoph]	0.9.7claws46
 
 	* src/main.c
diff --git a/configure.ac b/configure.ac
index c041d70fb..8cc2159df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=46
+EXTRA_VERSION=47
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/folder.c b/src/folder.c
index a7f965af4..4638d8f33 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -1839,8 +1839,6 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
 	procmsg_msginfo_set_flags(dest,
 				  ~dest->flags.perm_flags & perm_flags,
 				  ~dest->flags.tmp_flags  & tmp_flags);
-
-	folder_item_update(dest->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
 }
 
 static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo *flagsource)
@@ -1854,9 +1852,11 @@ static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo
 		item->unreadmarked_msgs++;
 	item->total_msgs++;
 
-	copy_msginfo_flags(flagsource, newmsginfo);
-
+	folder_item_update_freeze();
 	msgcache_add_msg(item->cache, newmsginfo);
+	copy_msginfo_flags(flagsource, newmsginfo);
+	folder_item_update(item, F_ITEM_UPDATE_CONTENT);
+	folder_item_update_thaw();
 }
 
 static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
diff --git a/src/procmsg.c b/src/procmsg.c
index e6fa6bd18..22b50d4d7 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -750,7 +750,6 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
 			procmsg_msginfo_free(msginfo);		/* refcnt-- */
 		}	
 	}
-	folder_item_update(outbox, TRUE);
 
 	return 0;
 }
-- 
2.25.1