fix 'Follow-up and Reply-to'

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index eb6be15a66c877493e5651d4176eea4252129aed..0c005079296bd1a7851794b08facb8402abbb7c2 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -128,6 +128,8 @@ static GdkPixmap *keyxpm;
 static GdkBitmap *keyxpmmask;
 static GdkPixmap *clipkeyxpm;
 static GdkBitmap *clipkeyxpmmask;
+static GdkPixmap *gpgsignedxpm;
+static GdkBitmap *gpgsignedxpmmask;
 
 static void summary_free_msginfo_func  (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
@@ -741,6 +743,8 @@ void summary_init(SummaryView *summaryview)
                         &clipkeyxpm, &clipkeyxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
                         &keyxpm, &keyxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
+                        &gpgsignedxpm, &gpgsignedxpmmask);
 
        if (!small_style) {
                small_style = gtk_style_copy
@@ -1089,6 +1093,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        /* set ctree and hash table from the msginfo list
           creating thread, and count the number of messages */
+       
        summary_set_ctree_from_list(summaryview, mlist);
 
        g_slist_free(mlist);
@@ -2263,7 +2268,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                summary_thread_init(summaryview);
        } else {
                gchar *text[N_SUMMARY_COLS];
-
+               cur = mlist;
                for (; mlist != NULL; mlist = mlist->next) {
                        msginfo = (MsgInfo *)mlist->data;
 
@@ -2283,6 +2288,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                                             msginfo->subject,
                                             node);
                }
+               mlist = cur;
        }
 
        if (prefs_common.enable_hscrollbar &&
@@ -2726,7 +2732,10 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
        }
 
-       if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
+       if (MSG_IS_SIGNED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+                                         gpgsignedxpm, gpgsignedxpmmask);
+       } else if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
                gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipkeyxpm, clipkeyxpmmask);
        } else if (MSG_IS_ENCRYPTED(flags)) {
@@ -3097,6 +3106,8 @@ void summary_delete_duplicated(SummaryView *summaryview)
        STATUSBAR_PUSH(summaryview->mainwin,
                       _("Deleting duplicated messages..."));
 
+       folder_item_update_freeze();
+       
        gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
                                GTK_CTREE_FUNC(summary_delete_duplicated_func),
                                summaryview);
@@ -3106,6 +3117,8 @@ void summary_delete_duplicated(SummaryView *summaryview)
        else
                summary_status_show(summaryview);
 
+       folder_item_update_thaw();
+
        debug_print("done.\n");
        STATUSBAR_POP(summaryview->mainwin);
        main_window_cursor_normal(summaryview->mainwin);
@@ -3704,7 +3717,7 @@ void summary_thread_build(SummaryView *summaryview)
                                                     msginfo->inreplyto);
                }
 
-               if (parent == NULL) {
+               if (prefs_common.thread_by_subject && parent == NULL) {
                        parent = subject_table_lookup
                                (summaryview->subject_table,
                                 msginfo->subject);
@@ -4131,7 +4144,7 @@ void summary_reply(SummaryView *summaryview, ComposeMode mode)
        case COMPOSE_FOLLOWUP_AND_REPLY_TO:
                compose_followup_and_reply_to(msginfo,
                                              prefs_common.reply_with_quote,
-                                             FALSE, TRUE, text);
+                                             FALSE, FALSE, text);
                break;
        case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
                compose_reply(msginfo, TRUE, FALSE, FALSE, TRUE, text);
@@ -5316,6 +5329,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm, &gpgsignedxpmmask);
 
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);