* src/procmsg.c

        ignore thread fix that did not mark all
        child nodes of a ignored thread as
        ignored. Does not work perfectly yet,
        but it is better now

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9e975f5dc73af549a42470d54c9fb3f5586a04be..656ae410cb7167c64f47b72746c9cea451e0cbca 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-08-13 [christoph] 0.8.1claws57
+
+       * src/procmsg.c
+               ignore thread fix that did not mark all
+               child nodes of a ignored thread as
+               ignored. Does not work perfectly yet,
+               but it is better now
+
 2002-08-13 [alfons]    0.8.1claws56
 
        * src/crash.c

diff --git a/configure.in b/configure.in
index 2d7f5c36bd0937b7c6552ab4a186ba6f53a9ca7e..1aad82553c2604637f5b9b72e2e7e7e93826741f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws56
+EXTRA_VERSION=claws57
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/procmsg.c b/src/procmsg.c
index 461c0c9d89aa7d7b40c602bb381eab62d8e26100..e038cf59bbcb0ba90affae609f4c8a2c611242c9 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -531,6 +531,13 @@ FILE *procmsg_open_mark_file(const gchar *folder, gboolean append)
        return fp;
 }
 
+static gboolean procmsg_ignore_node(GNode *node, gpointer data)
+{
+       MsgInfo *msginfo = (MsgInfo *)node->data;
+       
+       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+}
+
 /* return the reversed thread tree */
 GNode *procmsg_get_thread_tree(GSList *mlist)
 {
@@ -597,7 +604,7 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                                (parent, parent->children, node);
                        /* CLAWS: ignore thread */
                        if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-                               procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+                               g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, procmsg_ignore_node, NULL);
                        }
                }
                node = next;
@@ -628,13 +635,13 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                                g_node_append(parent, node);
                                /* CLAWS: ignore thread */
                                if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
-                                       procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+                                       g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, procmsg_ignore_node, NULL);
                                }
                        }
                }                                       
                node = next;
        }               
-               
+
        g_hash_table_destroy(subject_table);
        g_hash_table_destroy(msgid_table);