0.8.11claws29

* src/procmsg.c
        add temp flag handling, will make moving and copying
        messages possible again

* src/folder.c
        correct calulation of folder stats

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 864f7c2722883233a251f2512244aa37a9b12331..9069c0e22859617576a96548646df2d0e1ac5530 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,14 @@
+2003-03-19 [christoph] 0.8.11claws29
+
+       * src/procmsg.c
+               add temp flag handling, will make moving and copying
+               messages possible again
+
+       * src/folder.c
+               correct calulation of folder stats
+
 2003-03-18 [match]     0.8.11claws28
+
        * src/editgroup.h
                remove case sensitive comparison (closes bug 80).
 

diff --git a/configure.ac b/configure.ac
index 9a4703a0c75c605dc43cadeffacc470e6c5f29db..434db50b822d5e89eba5eee503efb738124ca117 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws28
+EXTRA_VERSION=claws29
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index f0a074e11dba6eb996fbb7f8d41f31ce6e2e166d..68c744c749bf38d86dfa7fb89005c642a2211985 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1223,18 +1223,18 @@ gint folder_item_scan(FolderItem *item)
                MsgInfo *msginfo;
 
                msginfo = elem->data;
+               if (MSG_IS_IGNORE_THREAD(msginfo->flags) && (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
+                       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+               if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD)) {
+                       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+                       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+               }
                if (MSG_IS_NEW(msginfo->flags))
                        newcnt++;
                if (MSG_IS_UNREAD(msginfo->flags))
                        unreadcnt++;
                if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                        unreadmarkedcnt++;
-               if (MSG_IS_IGNORE_THREAD(msginfo->flags) && (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
-                       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
-               if (procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD)) {
-                       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
-                       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
-               }
                totalcnt++;
 
                procmsg_msginfo_free(msginfo);

diff --git a/src/procmsg.c b/src/procmsg.c
index 1f8207069d13636c43ae978d8ed392783ce88194..e9fea267e67b69fdb47fec50afd90b753448ff21 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1121,6 +1121,9 @@ void procmsg_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmp
                hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
                folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
        }
+
+       /* Tmp flags hanlding */
+       msginfo->flags.tmp_flags |= tmp_flags;
 }
 
 void procmsg_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmpFlags tmp_flags)
@@ -1148,6 +1151,9 @@ void procmsg_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgT
                hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
                folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
        }
+
+       /* Tmp flags hanlding */
+       msginfo->flags.tmp_flags &= ~tmp_flags;
 }
 
 /*!