fix incorrect subject by threading

[claws.git] / src / procmsg.c

diff --git a/src/procmsg.c b/src/procmsg.c
index d359c8061bd4d00e47ae2a41b828dcbddd1f5195..5b74a8b3d7ca9c5240980f96e549b67e41b97b5c 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -207,7 +207,7 @@ GSList *procmsg_read_cache(FolderItem *item, gboolean scan_file)
        setvbuf(fp, file_buf, _IOFBF, sizeof(file_buf));
        g_free(cache_file);
 
-       debug_print(_("\tReading summary cache..."));
+       debug_print(_("\tReading summary cache...\n"));
 
        /* compare cache version */
        if (fread(&ver, sizeof(ver), 1, fp) != 1 ||
@@ -280,7 +280,7 @@ void procmsg_set_flags(GSList *mlist, FolderItem *item)
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       debug_print(_("\tMarking the messages..."));
+       debug_print(_("\tMarking the messages...\n"));
 
        markdir = folder_item_get_path(item);
        if (!is_dir_exist(markdir))
@@ -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,
@@ -423,6 +425,8 @@ void procmsg_get_mark_sum(const gchar *folder,
                g_hash_table_foreach(mark_table, mark_sum_func, &marksum);
                g_hash_table_destroy(mark_table);
        }
+       debug_print("mark->new = %d, mark->unread = %d, mark->total = %d\n",
+                   *(marksum.new), *(marksum.unread), *(marksum.total));
 }
 
 static GHashTable *procmsg_read_mark_file(const gchar *folder)
@@ -494,6 +498,76 @@ 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 *msgid_table;
+       GHashTable *subject_table;
+       MsgInfo *msginfo;
+       const gchar *msgid;
+       const gchar *subject;
+
+       root = g_node_new(NULL);
+       msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
+       subject_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(msgid_table, msginfo->inreplyto);
+                       if (parent == NULL) {
+                               parent = root;
+                       } else {
+                               if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags)) {
+                                       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+                               }
+                       }
+               }
+               node = g_node_insert_data_before
+                       (parent, parent == root ? parent->children : NULL,
+                        msginfo);
+               if ((msgid = msginfo->msgid) &&
+                   g_hash_table_lookup(msgid_table, msgid) == NULL)
+                       g_hash_table_insert(msgid_table, (gchar *)msgid, node);
+
+               subject = msginfo->subject;
+               if (subject_table_lookup(subject_table,
+                                        (gchar *) subject) == NULL)
+                       subject_table_insert(subject_table, (gchar *)subject,
+                                            node);
+       }
+
+       /* complete the unfinished threads */
+       for (node = root->children; node != NULL; ) {
+               next = node->next;
+               msginfo = (MsgInfo *)node->data;
+               parent = NULL;
+
+               if (msginfo->inreplyto)
+                       parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
+               if (parent == NULL && subject_is_reply(msginfo->subject))
+                       parent = subject_table_lookup(subject_table, msginfo->subject);
+               
+               if (parent && parent != node) {
+                       g_node_unlink(node);
+                       g_node_insert_before
+                               (parent, parent->children, node);
+                       if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags)) {
+                               MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+                       }
+               }
+               node = next;
+       }
+
+       g_hash_table_destroy(subject_table);
+       g_hash_table_destroy(msgid_table);
+
+       return root;
+}
+
 void procmsg_move_messages(GSList *mlist)
 {
        GSList *cur, *movelist = NULL;