0.8.11claws25

* src/folder.c
* src/procmsg.c
* src/summaryview.c
        unset NEW and UNREAD flags when message is ignored, to make
        sure messages don't show up as unread on other IMAP clients,
        because the IGNORE_THREAD flag can not be syncronized through
        the IMAP folder

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 48a88479a3f9b4f61709de5f0f0ec7413835608d..148e2bfb2ea6911edf0088f270e9e932c8edc3e1 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2003-03-17 [christoph] 0.8.11claws25
+
+       * src/folder.c
+       * src/procmsg.c
+       * src/summaryview.c
+               unset NEW and UNREAD flags when message is ignored, to make
+               sure messages don't show up as unread on other IMAP clients,
+               because the IGNORE_THREAD flag can not be syncronized through
+               the IMAP folder
+
 2003-03-17 [christoph] 0.8.11claws24
 
        * src/imap.c

diff --git a/configure.ac b/configure.ac
index 30c0a0e41624e2f20dfbc9fb5406febaf4139774..697d30abadbb146c5ffdc11c77780a366a1c34c7 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=claws24
+EXTRA_VERSION=claws25
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index 312373c326f9d51472dfe0371dba09e74739ae1d..66d77d435a79f5bc212cbdc1aac7b78581b6e49d 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1229,8 +1229,10 @@ gint folder_item_scan(FolderItem *item)
                        unreadcnt++;
                if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                        unreadmarkedcnt++;
-               if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
+               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);
+               }
                totalcnt++;
 
                procmsg_msginfo_free(msginfo);

diff --git a/src/procmsg.c b/src/procmsg.c
index 2240b14ec3065591a820080be29db026a5011769..306bdcd4db8a6f51cc952f5c799413578b83b430 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -137,6 +137,7 @@ static gboolean procmsg_ignore_node(GNode *node, gpointer data)
 {
        MsgInfo *msginfo = (MsgInfo *)node->data;
        
+       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
        procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
 
        return FALSE;
@@ -167,6 +168,7 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                                parent = root;
                        } else {
                                if (MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
+                                       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
                                        procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
                                }
                        }

diff --git a/src/summaryview.c b/src/summaryview.c
index 813b85669324cd5086abd743e473aa8160de8231..a05f0b59fd62180effd3b9fb3331da4069394cbb 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5110,6 +5110,7 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
        if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked--;
 
+       procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
        procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
 
        summary_set_row_marks(summaryview, row);
@@ -5122,10 +5123,14 @@ static void summary_ignore_thread(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
+
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
                gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_ignore_thread_func), summaryview);
        }
 
+       folder_item_update_thaw();
+
        summary_status_show(summaryview);
 }
 
@@ -5155,10 +5160,14 @@ static void summary_unignore_thread(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
+
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
                gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_unignore_thread_func), summaryview);
        }
 
+       folder_item_update_thaw();
+
        summary_status_show(summaryview);
 }