* src/msgcache.c

        set MsgInfo TmpFlags for queue and draft folders
        (closes bug "[ 591676 ] Queue ignore MIME on restart")

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 569a18b94c0ecf1865e6075c18802100ba49d844..8e5d00006c21c850b0c6cc0f232c301adbfeaf0e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-09-10 [christoph] 0.8.2claws33
+
+       * src/msgcache.c
+               set MsgInfo TmpFlags for queue and draft folders
+               (closes bug "[ 591676 ] Queue ignore MIME on restart")
+
 2002-09-10 [paul]      0.8.2claws32
 
        * AUTHORS

diff --git a/configure.in b/configure.in
index 662226ffcde6756a1bec11de7b9f44e8fb91c5b3..872c9c80dd04c4968d6120abc688a8bfd28bf1a9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws32
+EXTRA_VERSION=claws33
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/msgcache.c b/src/msgcache.c
index e8d5b1f7f4426ee7cac2079bac27e3fed2473894..db899f31b9a4423e4b3a9a6e39e2ebc9a4a24af5 100644 (file)
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -195,7 +195,7 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
        MsgCache *cache;
        FILE *fp;
        MsgInfo *msginfo;
-/*     MsgFlags default_flags; */
+       MsgTmpFlags tmp_flags = 0;
        gchar file_buf[BUFFSIZE];
        gint ver;
        guint num;
@@ -220,6 +220,12 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
                return NULL;
        }
 
+       if (item->stype == F_QUEUE) {
+               tmp_flags |= MSG_QUEUED;
+       } else if (item->stype == F_DRAFT) {
+               tmp_flags |= MSG_DRAFT;
+       }
+
        cache = msgcache_new();
 
        g_hash_table_freeze(cache->msgnum_table);
@@ -245,11 +251,8 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
                READ_CACHE_DATA(msginfo->references, fp);
                READ_CACHE_DATA(msginfo->xref, fp);
 
-/*
-               MSG_SET_PERM_FLAGS(msginfo->flags, default_flags.perm_flags);
-               MSG_SET_TMP_FLAGS(msginfo->flags, default_flags.tmp_flags);
-*/
                msginfo->folder = item;
+               msginfo->flags.tmp_flags |= tmp_flags;
 
                g_hash_table_insert(cache->msgnum_table, &msginfo->msgnum, msginfo);
                if(msginfo->msgid)