fix msg selection after delete/trash

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 4986a65a1c33545aab016746fd88614e63a2c99f..642df587167e8da66b1eea467b57e87c9c4a0c9d 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -461,6 +461,14 @@ void summary_thaw(SummaryView *summaryview)
                gtk_cmclist_thaw(GTK_CMCLIST(summaryview->ctree));
 }
 
+void summary_thaw_with_status(SummaryView *summaryview)
+{
+       if (summaryview) {
+               summary_status_show(summaryview);
+               gtk_cmclist_thaw(GTK_CMCLIST(summaryview->ctree));
+       }
+}
+
 void summary_grab_focus(SummaryView *summaryview)
 {
        if (summaryview)
@@ -2809,7 +2817,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
 
                if (summaryview->sort_key == sort_by[type] ||
                    (summaryview->sort_key == SORT_BY_THREAD_DATE &&
-                    sort_by[SORT_BY_DATE])) {
+                    sort_by[SORT_BY_DATE] && type == S_COL_DATE)) {
                        arrow = gtk_arrow_new
                                (summaryview->sort_type == SORT_ASCENDING
                                 ? GTK_ARROW_DOWN : GTK_ARROW_UP,
@@ -4118,7 +4126,7 @@ void summary_mark_all_read(SummaryView *summaryview)
        if (prefs_common.ask_mark_all_read) {
                val = alertpanel_full(_("Mark all as read"),
                        _("Do you really want to mark all mails in this "
-                         "folder as read?"), GTK_STOCK_NO, _("Mark all as read"), NULL,
+                         "folder as read?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
                          TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
                if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -4421,10 +4429,15 @@ void summary_delete(SummaryView *summaryview)
        folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
 
-       node = summary_find_next_msg(summaryview, sel_last);
-       if (!node)
+       if (summaryview->sort_type == SORT_ASCENDING) {
+               node = summary_find_next_msg(summaryview, sel_last);
+               if (!node)
+                       node = summary_find_prev_msg(summaryview, sel_last);
+       } else {
                node = summary_find_prev_msg(summaryview, sel_last);
-
+               if (!node)
+                       node = summary_find_next_msg(summaryview, sel_last);
+       }
        summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
        
        if (prefs_common.immediate_exec || folder_has_parent_of_type(item, F_TRASH)) {
@@ -4579,9 +4592,16 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
        if (prefs_common.immediate_exec) {
                summary_execute(summaryview);
        } else {
-               GtkCMCTreeNode *node = summary_find_next_msg(summaryview, sel_last);
-               if (!node)
+               GtkCMCTreeNode *node = NULL;
+               if (summaryview->sort_type == SORT_ASCENDING) {
+                       node = summary_find_next_msg(summaryview, sel_last);
+                       if (!node)
+                               node = summary_find_prev_msg(summaryview, sel_last);
+               } else {
                        node = summary_find_prev_msg(summaryview, sel_last);
+                       if (!node)
+                               node = summary_find_next_msg(summaryview, sel_last);
+               }
                summary_select_node(summaryview, node, summaryview->display_msg, TRUE);
                summary_status_show(summaryview);
        }
@@ -4602,8 +4622,7 @@ void summary_move_to(SummaryView *summaryview)
        if (!summaryview->folder_item ||
            FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
 
-       to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
-                                        FOLDER_SEL_MOVE, NULL, FALSE);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE);
        summary_move_selected_to(summaryview, to_folder);
 }
 
@@ -4683,8 +4702,7 @@ void summary_copy_to(SummaryView *summaryview)
 
        if (!summaryview->folder_item) return;
 
-       to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
-                                        FOLDER_SEL_COPY, NULL, FALSE);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE);
        summary_copy_selected_to(summaryview, to_folder);
 }
 
@@ -4942,10 +4960,15 @@ gboolean summary_execute(SummaryView *summaryview)
                if (!new_selected &&
                    gtkut_ctree_node_is_selected(ctree, node)) {
                        summary_unselect_all(summaryview);
-                       new_selected = summary_find_next_msg(summaryview, node);
-                       if (!new_selected)
-                               new_selected = summary_find_prev_msg
-                                       (summaryview, node);
+                       if (summaryview->sort_type == SORT_ASCENDING) {
+                               new_selected = summary_find_next_msg(summaryview, node);
+                               if (!new_selected)
+                                       new_selected = summary_find_prev_msg(summaryview, node);
+                       } else {
+                               new_selected = summary_find_prev_msg(summaryview, node);
+                               if (!new_selected)
+                                       new_selected = summary_find_next_msg(summaryview, node);
+                       }
                }
 
                gtk_sctree_remove_node((GtkSCTree *)ctree, node);