2007-07-27 [paul] 2.10.0cvs74

[claws.git] / src / procmsg.c

diff --git a/src/procmsg.c b/src/procmsg.c
index f980c84849e5d6b5e5f501e814c00cd1873d510c..4f54ab73394721a09f4aba4378e863a5e2eabdfa 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1848,6 +1848,9 @@ void procmsg_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmp
        if ((perm_flags & MSG_IGNORE_THREAD) || (perm_flags_old & MSG_IGNORE_THREAD)) {
                perm_flags_new &= ~(MSG_NEW | MSG_UNREAD);
        }
+       if ((perm_flags & MSG_WATCH_THREAD) || (perm_flags_old & MSG_WATCH_THREAD)) {
+               perm_flags_new &= ~(MSG_IGNORE_THREAD);
+       }
 
        if (perm_flags_old != perm_flags_new) {
                folder_item_change_msg_flags(msginfo->folder, msginfo, perm_flags_new);
@@ -1926,6 +1929,9 @@ void procmsg_msginfo_change_flags(MsgInfo *msginfo,
        if ((add_perm_flags & MSG_IGNORE_THREAD) || (perm_flags_old & MSG_IGNORE_THREAD)) {
                perm_flags_new &= ~(MSG_NEW | MSG_UNREAD);
        }
+       if ((add_perm_flags & MSG_WATCH_THREAD) || (perm_flags_old & MSG_WATCH_THREAD)) {
+               perm_flags_new &= ~(MSG_IGNORE_THREAD);
+       }
 
        if (perm_flags_old != perm_flags_new) {
                folder_item_change_msg_flags(msginfo->folder, msginfo, perm_flags_new);