2005-12-08 [colin] 1.9.100cvs77

	* src/folder.c
		Fix the occasionnal item->cache != NULL
		assertion failure.

diff --git a/ChangeLog b/ChangeLog
index 26b4f1d1d61fb8adb11cce3a13a5a4f3be9b8dc1..96b946f82549695526f3de88a8a3b51b2a776256 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-08 [colin]     1.9.100cvs77
+
+       * src/folder.c
+               Fix the occasionnal item->cache != NULL 
+               assertion failure. 
+
 2005-12-08 [colin]     1.9.100cvs76
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index 2b1a0cada744eb62ced9ebc6a21b9d4616e454a9..3f261251bd46d8c14938fd8f3b306ad07fb1f441 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1060,3 +1060,4 @@
 ( cvs diff -u -r 1.30.2.20 -r 1.30.2.21 src/prefs_toolbar.c;  ) > 1.9.100cvs74.patchset
 ( cvs diff -u -r 1.204.2.70 -r 1.204.2.71 src/prefs_common.c;  cvs diff -u -r 1.103.2.37 -r 1.103.2.38 src/prefs_common.h;  cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/gtk/filesel.c;  ) > 1.9.100cvs75.patchset
 ( cvs diff -u -r 1.83.2.52 -r 1.83.2.53 src/mimeview.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/sgpgme.c;  ) > 1.9.100cvs76.patchset
+( cvs diff -u -r 1.213.2.69 -r 1.213.2.70 src/folder.c;  ) > 1.9.100cvs77.patchset

diff --git a/configure.ac b/configure.ac
index 2561484f15689da17124db46d54d6fd6d43a3bbd..a7d8da2ba8a1deac43effc2cc0aad82688b60e10 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=76
+EXTRA_VERSION=77
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index d88beaf188ace4e5fbdc7e19708a4ae346d0aae8..896e82ff044e20a2024ef51b1fa240f9401598fd 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2432,6 +2432,10 @@ static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo
        item->total_msgs++;
 
        folder_item_update_freeze();
+
+       if (!item->cache)
+               folder_item_read_cache(item);
+
        msgcache_add_msg(item->cache, newmsginfo);
        copy_msginfo_flags(flagsource, newmsginfo);
        folder_item_update_with_msg(item,  F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_ADDMSG, newmsginfo);