sync with sylpheed 0.6.3cvs7

[claws.git] / src / procmsg.c

diff --git a/src/procmsg.c b/src/procmsg.c
index a22c92e9e54984f3d281ac56953e2dfd9f31a63c..31ea663bd9df5e257c94c883e6c425395e532967 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,
@@ -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;
@@ -630,7 +680,7 @@ gboolean procmsg_msg_exist(MsgInfo *msginfo)
 
        if (!msginfo) return FALSE;
 
-       path = procmsg_get_message_file_path(msginfo);
+       path = folder_item_get_path(msginfo->folder);
        change_dir(path);
        ret = !folder_item_is_msg_changed(msginfo->folder, msginfo);
        g_free(path);
@@ -653,6 +703,7 @@ gint procmsg_send_queue(void)
 {
        FolderItem *queue;
        gint i;
+       gint ret = 0;
 
        queue = folder_get_default_queue();
        g_return_val_if_fail(queue != NULL, -1);
@@ -666,16 +717,15 @@ gint procmsg_send_queue(void)
                file = folder_item_fetch_msg(queue, i);
                if (file) {
                        if (send_message_queue(file) < 0) {
-                               g_warning(_("Sending queued message failed.\n"));
-                               g_free(file);
-                               return -1;
-                       }
-                       folder_item_remove_msg(queue, i);
+                               g_warning(_("Sending queued message %d failed.\n"), i);
+                               ret = -1;
+                       } else
+                               folder_item_remove_msg(queue, i);
                        g_free(file);
                }
        }
 
-       return 0;
+       return ret;
 }
 
 void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
@@ -689,7 +739,7 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
 
        g_return_if_fail(msginfo);
 
-       if ((tmpfp = procmime_get_text_part(msginfo)) == NULL) {
+       if ((tmpfp = procmime_get_first_text_content(msginfo)) == NULL) {
                g_warning(_("Can't get text part\n"));
                return;
        }