reedit enabled in queue

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 30b1a20699f88dbaf5802c02c1aed45962d776dc..97c2d3be4f8d658a3f8488ae32946d590e3dc7d8 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -74,6 +74,7 @@
 #include "addressbook.h"
 #include "addr_compl.h"
 #include "scoring.h"
+#include "prefs_folder_item.h"
 
 #include "pixmaps/dir-open.xpm"
 #include "pixmaps/mark.xpm"
@@ -603,7 +604,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        STATUSBAR_POP(summaryview->mainwin);
 
-       is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
+       is_refresh = (!prefs_common.open_inbox_on_inc &&
+                     item == summaryview->folder_item) ? TRUE : FALSE;
        if (is_refresh) {
                prev_msgnum = summary_get_current_msgnum(summaryview);
                if (prev_msgnum < 1)
@@ -626,7 +628,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        return FALSE;
        } else
 #endif
-               summary_write_cache(summaryview);
+               if (!is_refresh)
+                       summary_write_cache(summaryview);
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
@@ -841,7 +844,9 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        menu_set_sensitive(ifactory, "/Open in new window", sens);
        menu_set_sensitive(ifactory, "/View source", sens);
        menu_set_sensitive(ifactory, "/Show all header", sens);
-       if (summaryview->folder_item->stype == F_DRAFT)
+       if ((summaryview->folder_item->stype == F_DRAFT) ||
+           (summaryview->folder_item->stype == F_OUTBOX) ||
+           (summaryview->folder_item->stype == F_QUEUE))
                menu_set_sensitive(ifactory, "/Reedit", sens);
 
        menu_set_sensitive(ifactory, "/Save as...", sens);
@@ -1322,6 +1327,9 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
        GtkCListCompareFunc cmp_func;
 
+       if (!summaryview->folder_item)
+               return;
+
        switch (type) {
        case SORT_BY_NUMBER:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_num;
@@ -1383,9 +1391,13 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
+       MsgInfo *parentinfo;
+       MsgInfo *cur_msginfo;
        GtkCTreeNode *node, *parent;
        gchar *text[N_SUMMARY_COLS];
        GHashTable *msgid_table;
+       GSList * cur;
+       GtkCTreeNode *cur_parent;
 
        if (!mlist) return;
 
@@ -1398,18 +1410,27 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 
        if (prefs_common.use_addr_book)
                start_address_completion();
+       
+       main_window_set_thread_option(summaryview->mainwin);
 
-       if (prefs_common.enable_thread) {
+       for (cur = mlist ; cur != NULL; cur = cur->next) {
+               msginfo = (MsgInfo *)cur->data;
+               msginfo->threadscore = msginfo->score;
+       }
+
+       /*      if (prefs_common.enable_thread) { */
+       if (summaryview->folder_item->prefs->enable_thread) {
                for (; mlist != NULL; mlist = mlist->next) {
                        msginfo = (MsgInfo *)mlist->data;
                        parent = NULL;
 
-                       summary_set_header(text, msginfo);
-
                        /* search parent node for threading */
-                       if (msginfo->inreplyto && *msginfo->inreplyto)
+                       if (msginfo->inreplyto && *msginfo->inreplyto) {
                                parent = g_hash_table_lookup
                                        (msgid_table, msginfo->inreplyto);
+                       }
+
+                       summary_set_header(text, msginfo);
 
                        node = gtk_ctree_insert_node
                                (ctree, parent, NULL, text, 2,
@@ -1424,6 +1445,33 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                            == NULL)
                                g_hash_table_insert(msgid_table,
                                                    msginfo->msgid, node);
+
+                       cur_parent = parent;
+                       cur_msginfo = msginfo;
+                       while (cur_parent != NULL) {
+                               parentinfo = gtk_ctree_node_get_row_data(ctree, cur_parent);
+
+                               if (!parentinfo)
+                                       break;
+                               
+                               if (parentinfo->threadscore <
+                                   cur_msginfo->threadscore) {
+                                       gchar * s;
+                                       parentinfo->threadscore =
+                                               cur_msginfo->threadscore;
+#if 0
+                                       s = itos(parentinfo->threadscore);
+                                       gtk_ctree_node_set_text(ctree, cur_parent, S_COL_SCORE, s);
+#endif
+                               }
+                               else break;
+                               
+                               cur_msginfo = parentinfo;
+                               if (cur_msginfo->inreplyto &&
+                                   *cur_msginfo->inreplyto) {
+                                       cur_parent = g_hash_table_lookup(msgid_table, cur_msginfo->inreplyto);
+                               }
+                       }
                }
 
                /* complete the thread */
@@ -1552,7 +1600,11 @@ static void summary_set_header(gchar *text[], MsgInfo *msginfo)
        text[S_COL_MIME] = NULL;
        text[S_COL_NUMBER] = itos_buf(col_number, msginfo->msgnum);
        text[S_COL_SIZE]   = to_human_readable(msginfo->size);
+#if 0
+       text[S_COL_SCORE]  = itos_buf(col_score, msginfo->threadscore);
+#else
        text[S_COL_SCORE]  = itos_buf(col_score, msginfo->score);
+#endif
 
        if (msginfo->date_t) {
                procheader_date_get_localtime(date_modified,
@@ -1567,7 +1619,8 @@ static void summary_set_header(gchar *text[], MsgInfo *msginfo)
        text[S_COL_FROM] = msginfo->fromname ? msginfo->fromname :
                _("(No From)");
        if (prefs_common.swap_from && msginfo->from && msginfo->to &&
-           cur_account && cur_account->address) {
+           cur_account && cur_account->address &&
+           !MSG_IS_NEWS(msginfo->flags)) {
                gchar *from;
 
                Xalloca(from, strlen(msginfo->from) + 1, return);
@@ -1704,7 +1757,9 @@ void summary_reedit(SummaryView *summaryview)
 
        if (!summaryview->selected) return;
        if (!summaryview->folder_item ||
-           summaryview->folder_item->stype != F_DRAFT) return;
+           (summaryview->folder_item->stype != F_DRAFT &&
+            summaryview->folder_item->stype != F_OUTBOX &&
+            summaryview->folder_item->stype != F_QUEUE)) return;
 
        msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
                                              summaryview->selected);
@@ -2245,6 +2300,7 @@ void summary_print(SummaryView *summaryview)
            strchr(p + 2, '%')) {
                alertpanel_error(_("Print command line is invalid:\n`%s'"),
                                 cmdline);
+               g_free(cmdline);
                return;
        }
 
@@ -2253,6 +2309,8 @@ void summary_print(SummaryView *summaryview)
                        (ctree, GTK_CTREE_NODE(cur->data));
                if (msginfo) procmsg_print_message(msginfo, cmdline);
        }
+       
+       g_free(cmdline);
 }
 
 void summary_execute(SummaryView *summaryview)
@@ -2966,10 +3024,10 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
                compose_reply(msginfo, FALSE, TRUE);
                break;
        case COMPOSE_FORWARD:
-               compose_forward(msginfo, FALSE);
+               compose_forward(NULL, msginfo, FALSE);
                break;
        case COMPOSE_FORWARD_AS_ATTACH:
-               compose_forward(msginfo, TRUE);
+               compose_forward(NULL, msginfo, TRUE);
                break;
        default:
                compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
@@ -3218,7 +3276,7 @@ static gint summary_cmp_by_score(GtkCList *clist,
 
        /* if score are equal, sort by date */
 
-       diff = msginfo1->score - msginfo2->score;
+       diff = msginfo1->threadscore - msginfo2->threadscore;
        if (diff != 0)
                return diff;
        else