sync with sylpheed 0.6.3cvs7

[claws.git] / src / procmsg.c

diff --git a/src/procmsg.c b/src/procmsg.c
index 250881e647c1b9856217efc6d3d168ac28cc0111..31ea663bd9df5e257c94c883e6c425395e532967 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -404,6 +404,8 @@ static void mark_sum_func(gpointer key, gpointer value, gpointer data)
        if (MSG_IS_NEW(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->new)++;
        if (MSG_IS_UNREAD(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->unread)++;
        (*marksum->total)++;
+
+       g_free(flags);
 }
 
 void procmsg_get_mark_sum(const gchar *folder,
@@ -494,6 +496,54 @@ FILE *procmsg_open_mark_file(const gchar *folder, gboolean append)
        return fp;
 }
 
+/* return the reversed thread tree */
+GNode *procmsg_get_thread_tree(GSList *mlist)
+{
+       GNode *root, *parent, *node, *next;
+       GHashTable *table;
+       MsgInfo *msginfo;
+       const gchar *msgid;
+
+       root = g_node_new(NULL);
+       table = g_hash_table_new(g_str_hash, g_str_equal);
+
+       for (; mlist != NULL; mlist = mlist->next) {
+               msginfo = (MsgInfo *)mlist->data;
+               parent = root;
+
+               if (msginfo->inreplyto) {
+                       parent = g_hash_table_lookup(table, msginfo->inreplyto);
+                       if (parent == NULL)
+                               parent = root;
+               }
+               node = g_node_insert_data_before
+                       (parent, parent == root ? parent->children : NULL,
+                        msginfo);
+               if ((msgid = msginfo->msgid) &&
+                   g_hash_table_lookup(table, msgid) == NULL)
+                       g_hash_table_insert(table, (gchar *)msgid, node);
+       }
+
+       /* complete the unfinished threads */
+       for (node = root->children; node != NULL; ) {
+               next = node->next;
+               msginfo = (MsgInfo *)node->data;
+               if (msginfo->inreplyto) {
+                       parent = g_hash_table_lookup(table, msginfo->inreplyto);
+                       if (parent && parent != node) {
+                               g_node_unlink(node);
+                               g_node_insert_before
+                                       (parent, parent->children, node);
+                       }
+               }
+               node = next;
+       }
+
+       g_hash_table_destroy(table);
+
+       return root;
+}
+
 void procmsg_move_messages(GSList *mlist)
 {
        GSList *cur, *movelist = NULL;