* src/summaryview.c

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index f0a7f76f631745bd4cfa809276164a0fa92ef398..006c7a7d104276d86a9cfce0b4ef4fde4168c0d1 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1058,7 +1058,6 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                menu_set_sensitive(ifactory, "/Move...", FALSE);
 
        menu_set_sensitive(ifactory, "/Delete", TRUE);
-       menu_set_sensitive(ifactory, "/Select thread", TRUE);
        menu_set_sensitive(ifactory, "/Select all", TRUE);
        menu_set_sensitive(ifactory, "/Copy...", TRUE);
        menu_set_sensitive(ifactory, "/Execute", TRUE);
@@ -1096,6 +1095,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        else
                menu_set_sensitive(ifactory, "/Re-edit", FALSE);
 
+       menu_set_sensitive(ifactory, "/Select thread", sens);
        menu_set_sensitive(ifactory, "/Save as...", sens);
        menu_set_sensitive(ifactory, "/Print...",   TRUE);
 
@@ -2259,16 +2259,22 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
            !MSG_IS_NEWS(msginfo->flags)) {
                gchar *addr = NULL;
 
-               if (prefs_common.use_addr_book) {
-                       Xstrdup_a(addr, msginfo->from, return);
-                       extract_address(addr);
+               Xstrdup_a(addr, msginfo->from, return);
+               extract_address(addr);
 
+               if (prefs_common.use_addr_book) {
                        if (account_find_from_address(addr)) {
                                addr = summary_complete_address(msginfo->to);
                                g_free(to);
                                to   = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
                                text[col_pos[S_COL_FROM]] = to;
                        }
+               } else {
+                       if (cur_account && cur_account->address && !strcmp( addr, cur_account->address)) {
+                               g_free(to);
+                               to = g_strconcat("-->", msginfo->to, NULL);
+                               text[col_pos[S_COL_FROM]] = to;
+                       }
                }
        }
 
@@ -2342,12 +2348,11 @@ static void summary_display_msg_full(SummaryView *summaryview,
        }
        g_free(filename);
 
-/* NOT NEEDED ANYMORE
        if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->newmsgs--;
        if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->unread--;
-*/
+
        procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
        summary_set_row_marks(summaryview, row);
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -2724,12 +2729,12 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
        MsgInfo *msginfo;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
-/* NOT NEEDED ANYMORE
+
        if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->newmsgs--;
        if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->unread--;
-*/
+
        procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
        summary_set_row_marks(summaryview, row);
        debug_print(_("Message %d is marked as read\n"),
@@ -2780,10 +2785,9 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
                procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
                summaryview->deleted--;
        }
-/* NOT NEEDED ANYMORE
+
        if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->unread++;
-*/
 
        procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED | MSG_FORWARDED, 0);
        procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
@@ -3639,7 +3643,7 @@ void summary_unthread(SummaryView *summaryview)
        debug_print(_("Unthreading..."));
        STATUSBAR_PUSH(summaryview->mainwin, _("Unthreading..."));
        main_window_cursor_wait(summaryview->mainwin);
-
+       
        gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
                                         summary_tree_collapsed, summaryview);
        gtk_clist_freeze(GTK_CLIST(ctree));
@@ -3656,6 +3660,9 @@ void summary_unthread(SummaryView *summaryview)
                }
        }
 
+       /* CLAWS: and sort it */
+       gtk_sctree_sort_recursive(ctree, NULL); 
+
        gtk_clist_thaw(GTK_CLIST(ctree));
        gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
                                           summary_tree_collapsed, summaryview);
@@ -4029,6 +4036,14 @@ void summary_reply(SummaryView *summaryview, ComposeMode mode)
        text = gtkut_editable_get_selection
                (GTK_EDITABLE(summaryview->messageview->textview->text));
 
+       if (!text && summaryview->messageview->type == MVIEW_MIME
+           && summaryview->messageview->mimeview->type == MIMEVIEW_TEXT
+           && summaryview->messageview->mimeview->textview
+           && !summaryview->messageview->mimeview->textview->default_text) {
+               text = gtkut_editable_get_selection (GTK_EDITABLE 
+                        (summaryview->messageview->mimeview->textview->text));   
+       }
+       
        switch (mode) {
        case COMPOSE_REPLY:
                compose_reply(msginfo, prefs_common.reply_with_quote,
@@ -5001,12 +5016,12 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
        MsgInfo *msginfo;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
-/* NOT NEEDED ANYMORE
+
        if (MSG_IS_NEW(msginfo->flags))
                summaryview->newmsgs--;
        if (MSG_IS_UNREAD(msginfo->flags))
                summaryview->unread--;
-*/
+
        procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
 
        summary_set_row_marks(summaryview, row);
@@ -5033,12 +5048,12 @@ static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpo
        MsgInfo *msginfo;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
-/* NOT NEEDED ANYMORE
+
        if (MSG_IS_NEW(msginfo->flags))
                summaryview->newmsgs++;
        if (MSG_IS_UNREAD(msginfo->flags))
                summaryview->unread++;
-*/
+
        procmsg_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
 
        summary_set_row_marks(summaryview, row);