Revert parts of 3.14.1-91 (the summary_select_node_no_mard_read func), obviously...
[claws.git] / src / summaryview.c
index 67578ccf2b1e3c9b9ec77b565907e6383bc1e7f5..41006d2119b217fe3ce59b2fa7d96f288685b074 100644 (file)
@@ -342,8 +342,8 @@ static gboolean summary_drag_motion_cb(GtkWidget      *widget,
 static void summary_drag_end(GtkWidget *widget,
                                          GdkDragContext *drag_context,
                                          SummaryView    *summaryview);
-/* custom compare functions for sorting */
 
+/* custom compare functions for sorting */
 static gint summary_cmp_by_mark                (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
@@ -423,31 +423,31 @@ GtkTargetEntry summary_drag_types[3] =
 
 static GtkActionEntry summary_popup_entries[] =
 {
-       {"SummaryViewPopup",                            NULL, "SummaryViewPopup" },
-       {"SummaryViewPopup/ReplyTo",                    NULL, N_("Repl_y to") },
-       {"SummaryViewPopup/Mark",                       NULL, N_("_Mark") },
-       {"SummaryViewPopup/ColorLabel",                 NULL, N_("Color la_bel") },
-       {"SummaryViewPopup/Tags",                       NULL, N_("Ta_gs") },
-       {"SummaryViewPopup/CreateFilterRule",           NULL, N_("Create _filter rule") },
+       {"SummaryViewPopup",                      NULL, "SummaryViewPopup", NULL, NULL, NULL },
+       {"SummaryViewPopup/ReplyTo",              NULL, N_("Repl_y to"), NULL, NULL, NULL },
+       {"SummaryViewPopup/Mark",                 NULL, N_("_Mark"), NULL, NULL, NULL },
+       {"SummaryViewPopup/ColorLabel",           NULL, N_("Color la_bel"), NULL, NULL, NULL },
+       {"SummaryViewPopup/Tags",                 NULL, N_("Ta_gs"), NULL, NULL, NULL },
+       {"SummaryViewPopup/CreateFilterRule",     NULL, N_("Create _filter rule"), NULL, NULL, NULL },
 #ifndef GENERIC_UMPC
-       {"SummaryViewPopup/CreateProcessingRule",       NULL, N_("Create processing rule") },
+       {"SummaryViewPopup/CreateProcessingRule", NULL, N_("Create processing rule"), NULL, NULL, NULL },
 #endif
-       {"SummaryViewPopup/View",                       NULL, N_("_View") },
+       {"SummaryViewPopup/View",                 NULL, N_("_View"), NULL, NULL, NULL },
 };
 
 static const gchar *const col_label[N_SUMMARY_COLS] = {
-       "",             /* S_COL_MARK    */
-       N_("S"),        /* S_COL_STATUS  */
-       "",             /* S_COL_MIME    */
-       N_("Subject"),  /* S_COL_SUBJECT */
-       N_("From"),     /* S_COL_FROM    */
-       N_("To"),       /* S_COL_TO      */
-       N_("Date"),     /* S_COL_DATE    */
-       N_("Size"),     /* S_COL_SIZE    */
-       N_("#"),        /* S_COL_NUMBER  */
-       N_("Score"),    /* S_COL_SCORE   */
-       "",             /* S_COL_LOCKED  */
-       N_("Tags"),     /* S_COL_TAGS    */
+       "",            /* S_COL_MARK    */
+       N_("S"),       /* S_COL_STATUS  */
+       "",            /* S_COL_MIME    */
+       N_("Subject"), /* S_COL_SUBJECT */
+       N_("From"),    /* S_COL_FROM    */
+       N_("To"),      /* S_COL_TO      */
+       N_("Date"),    /* S_COL_DATE    */
+       N_("Size"),    /* S_COL_SIZE    */
+       N_("#"),       /* S_COL_NUMBER  */
+       N_("Score"),   /* S_COL_SCORE   */
+       "",            /* S_COL_LOCKED  */
+       N_("Tags"),    /* S_COL_TAGS    */
 };
 
 void summary_freeze(SummaryView *summaryview)
@@ -706,10 +706,11 @@ SummaryView *summary_create(MainWindow *mainwin)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Mark", "Message/Mark/Mark", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Unmark", "Message/Mark/Unmark", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator1", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
-       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkRead", "Message/Mark/MarkRead", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkUnread", "Message/Mark/MarkUnread", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator2", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkAllRead", "Message/Mark/MarkAllRead", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "MarkAllUnread", "Message/Mark/MarkAllUnread", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "Separator3", "Message/Mark/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "IgnoreThread", "Message/Mark/IgnoreThread", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup/Mark", "UnignoreThread", "Message/Mark/UnignoreThread", GTK_UI_MANAGER_MENUITEM)
@@ -1481,9 +1482,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                        (ctree,
                                         item->sort_type == SORT_DESCENDING
                                         ? 0 : GTK_CMCLIST(ctree)->rows - 1);
-                       gtk_sctree_select(GTK_SCTREE(ctree), node);
-                       summaryview->selected = node;
-                       gtk_cmctree_node_moveto(ctree, node, 0, 0.5, 0);
+                       summary_select_node(summaryview, node, -1);
                }
        } else {
                /* backward compat */
@@ -1550,8 +1549,18 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                }
 
                summary_unlock(summaryview);
-               if (node)
-                       summary_select_node(summaryview, node, -1);
+
+               if (node) {
+                       gint open_selected = -1;
+                       if (!is_refresh) {
+                               if (prefs_common.open_selected_on_folder_open)
+                                       open_selected = 1;
+                               else
+                                       open_selected = 0;
+                       }
+                       summary_select_node(summaryview, node, open_selected);
+               }
+
                summary_lock(summaryview);
        }
 
@@ -1706,7 +1715,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
        gboolean sensitive;
        gint i;
 
-#define N_ENTRIES 38
+#define N_ENTRIES 39
        static struct {
                const gchar *entry;
                SensitiveCondMask cond;
@@ -1742,15 +1751,16 @@ do { \
        FILL_TABLE("Menus/SummaryViewPopup/Mark", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/Mark", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/Unmark", M_TARGET_EXIST);
-       FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkUnread", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkRead", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkUnread", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkAllRead", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkAllUnread", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/IgnoreThread", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/UnignoreThread", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/WatchThread", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/UnwatchThread", M_TARGET_EXIST);
-       FILL_TABLE("Menus/SummaryViewPopup/Mark/Unlock", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/Lock", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/Unlock", M_TARGET_EXIST);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
        FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
        FILL_TABLE("Menus/SummaryViewPopup/ColorLabel", M_TARGET_EXIST);
@@ -1804,7 +1814,10 @@ void summary_select_prev(SummaryView *summaryview)
        GtkCMCTreeNode *node = summaryview->selected;
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 
-       node = gtkut_ctree_node_prev(ctree, node);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = gtkut_ctree_node_prev(ctree, node);
+       else
+               node = gtkut_ctree_node_next(ctree, node);
 
        if (node && node != summaryview->selected)
                summary_select_node(summaryview, node, -1);
@@ -1815,7 +1828,10 @@ void summary_select_next(SummaryView *summaryview)
        GtkCMCTreeNode *node = summaryview->selected;
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 
-       node = gtkut_ctree_node_next(ctree, node);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = gtkut_ctree_node_next(ctree, node);
+       else
+               node = gtkut_ctree_node_prev(ctree, node);
 
        if (node && node != summaryview->selected)
                summary_select_node(summaryview, node, -1);
@@ -1824,16 +1840,13 @@ void summary_select_next(SummaryView *summaryview)
 void summary_select_prev_unread(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node;
-       gboolean skip_cur = FALSE;
-
-       if (summaryview->displayed 
-       &&  summaryview->selected == summaryview->displayed) {
-               debug_print("skipping current\n");
-               skip_cur = TRUE;
-       }
 
-       node = summary_find_prev_flagged_msg
-               (summaryview, summaryview->selected, MSG_UNREAD, skip_cur);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_prev_flagged_msg
+                       (summaryview, summaryview->selected, MSG_UNREAD, TRUE);
+       else
+               node = summary_find_next_flagged_msg
+                       (summaryview, summaryview->selected, MSG_UNREAD, TRUE);
 
        if (!node || node == summaryview->selected) {
                AlertValue val = 0;
@@ -1856,8 +1869,12 @@ void summary_select_prev_unread(SummaryView *summaryview)
                                        _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
                }
                if (val != G_ALERTALTERNATE) return;
-               node = summary_find_prev_flagged_msg(summaryview, NULL,
-                                                    MSG_UNREAD, FALSE);
+               if (summaryview->sort_type == SORT_ASCENDING)
+                       node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                                            MSG_UNREAD, FALSE);
+               else
+                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                            MSG_UNREAD, FALSE);
        }
 
        if (!node)
@@ -1869,65 +1886,52 @@ void summary_select_prev_unread(SummaryView *summaryview)
 void summary_select_next_unread(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node = summaryview->selected;
-       gboolean skip_cur = FALSE;
-       
-       if (summaryview->displayed 
-       &&  summaryview->selected == summaryview->displayed) {
-               debug_print("skipping cur (%p %p)\n",
-                       summaryview->displayed, summaryview->selected);
-               skip_cur = TRUE;
-       }
 
-       node = summary_find_next_flagged_msg
-               (summaryview, node, MSG_UNREAD, skip_cur);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_next_flagged_msg
+                       (summaryview, node, MSG_UNREAD, TRUE);
+       else
+               node = summary_find_prev_flagged_msg
+                       (summaryview, node, MSG_UNREAD, TRUE);
        
        if (node)
                summary_select_node(summaryview, node, -1);
        else {
-               node = summary_find_next_flagged_msg
-                       (summaryview, NULL, MSG_UNREAD, FALSE);
-               if (node == NULL || node == summaryview->selected) {
-                       AlertValue val = 0;
-
-                       switch (prefs_common.next_unread_msg_dialog) {
-                               case NEXTUNREADMSGDIALOG_ALWAYS:
-                                       val = alertpanel(_("No more unread messages"),
-                                                        _("No unread message found. "
-                                                          "Go to next folder?"),
-                                                        GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
-                                       break;
-                               case NEXTUNREADMSGDIALOG_ASSUME_YES:
-                                       val = G_ALERTALTERNATE;
-                                       break;
-                               case NEXTUNREADMSGDIALOG_ASSUME_NO:
-                                       val = G_ALERTOTHER;
-                                       break;
-                               default:
-                                       debug_print(
-                                               _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
-                       }
-
-                       if (val == G_ALERTALTERNATE)
-                               folderview_select_next_with_flag(summaryview->folderview, MSG_UNREAD);
-               } else {
-                       summary_select_node(summaryview, node, -1);
-               }
+               AlertValue val = 0;
+
+               switch (prefs_common.next_unread_msg_dialog) {
+                       case NEXTUNREADMSGDIALOG_ALWAYS:
+                               val = alertpanel(_("No more unread messages"),
+                                                _("No unread message found. "
+                                                  "Go to next folder?"),
+                                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                               break;
+                       case NEXTUNREADMSGDIALOG_ASSUME_YES:
+                               val = G_ALERTALTERNATE;
+                               break;
+                       case NEXTUNREADMSGDIALOG_ASSUME_NO:
+                               val = G_ALERTOTHER;
+                               break;
+                       default:
+                               debug_print(
+                                       _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+               }
+
+               if (val == G_ALERTALTERNATE)
+                       folderview_select_next_with_flag(summaryview->folderview, MSG_UNREAD);
        }
 }
 
 void summary_select_prev_new(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node;
-       gboolean skip_cur = FALSE;
 
-       if (summaryview->displayed 
-       &&  summaryview->selected == summaryview->displayed) {
-               debug_print("skipping current\n");
-               skip_cur = TRUE;
-       }
-
-       node = summary_find_prev_flagged_msg
-               (summaryview, summaryview->selected, MSG_NEW, skip_cur);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_prev_flagged_msg
+                       (summaryview, summaryview->selected, MSG_NEW, TRUE);
+       else
+               node = summary_find_next_flagged_msg
+                       (summaryview, summaryview->selected, MSG_NEW, TRUE);
 
        if (!node || node == summaryview->selected) {
                AlertValue val = 0;
@@ -1950,8 +1954,12 @@ void summary_select_prev_new(SummaryView *summaryview)
                                        _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
                }
                if (val != G_ALERTALTERNATE) return;
-               node = summary_find_prev_flagged_msg(summaryview, NULL,
-                                                    MSG_NEW, FALSE);
+               if (summaryview->sort_type == SORT_ASCENDING)
+                       node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                                            MSG_NEW, FALSE);
+               else
+                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                            MSG_NEW, FALSE);
        }
 
        if (!node)
@@ -1963,53 +1971,38 @@ void summary_select_prev_new(SummaryView *summaryview)
 void summary_select_next_new(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node = summaryview->selected;
-       gboolean skip_cur = FALSE;
-       
-       if (summaryview->displayed 
-       &&  summaryview->selected == summaryview->displayed) {
-               debug_print("skipping cur (%p %p)\n",
-                       summaryview->displayed, summaryview->selected);
-               skip_cur = TRUE;
-       }
 
-       node = summary_find_next_flagged_msg
-               (summaryview, node, MSG_NEW, skip_cur);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_next_flagged_msg
+                       (summaryview, node, MSG_NEW, TRUE);
+       else
+               node = summary_find_prev_flagged_msg
+                       (summaryview, node, MSG_NEW, TRUE);
        
        if (node)
                summary_select_node(summaryview, node, -1);
        else {
-               node = summary_find_next_flagged_msg
-                       (summaryview, NULL, MSG_NEW, FALSE);
-               if (node == NULL || node == summaryview->selected) {
-                       AlertValue val = 0;
-
-                       switch (prefs_common.next_unread_msg_dialog) {
-                               case NEXTUNREADMSGDIALOG_ALWAYS:
-                                       val = alertpanel(_("No more new messages"),
-                                                        _("No new message found. "
-                                                          "Go to next folder?"),
-                                                        GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
-                                       break;
-                               case NEXTUNREADMSGDIALOG_ASSUME_YES:
-                                       val = G_ALERTALTERNATE;
-                                       break;
-                               case NEXTUNREADMSGDIALOG_ASSUME_NO:
-                                       val = G_ALERTOTHER;
-                                       break;
-                               default:
-                                       debug_print(
-                                               _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
-                       }
-
-                       if (val == G_ALERTALTERNATE) {
-                               folderview_select_next_with_flag(summaryview->folderview, MSG_NEW);
-                               return;
-                       } 
-                       else
-                               return;
-               } else
-                       summary_select_node(summaryview, node, -1);
+               AlertValue val = 0;
 
+               switch (prefs_common.next_unread_msg_dialog) {
+                       case NEXTUNREADMSGDIALOG_ALWAYS:
+                               val = alertpanel(_("No more new messages"),
+                                                _("No new message found. "
+                                                  "Go to next folder?"),
+                                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                               break;
+                       case NEXTUNREADMSGDIALOG_ASSUME_YES:
+                               val = G_ALERTALTERNATE;
+                               break;
+                       case NEXTUNREADMSGDIALOG_ASSUME_NO:
+                               val = G_ALERTOTHER;
+                               break;
+                       default:
+                               debug_print(
+                                       _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+               }
+               if (val == G_ALERTALTERNATE)
+                       folderview_select_next_with_flag(summaryview->folderview, MSG_NEW);
        }
 }
 
@@ -2017,8 +2010,12 @@ void summary_select_prev_marked(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node;
 
-       node = summary_find_prev_flagged_msg
-               (summaryview, summaryview->selected, MSG_MARKED, TRUE);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_prev_flagged_msg
+                       (summaryview, summaryview->selected, MSG_MARKED, TRUE);
+       else
+               node = summary_find_next_flagged_msg
+                       (summaryview, summaryview->selected, MSG_MARKED, TRUE);
 
        if (!node) {
                AlertValue val;
@@ -2041,53 +2038,38 @@ void summary_select_prev_marked(SummaryView *summaryview)
 void summary_select_next_marked(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node = summaryview->selected;
-       gboolean skip_cur = FALSE;
-       
-       if (summaryview->displayed 
-       &&  summaryview->selected == summaryview->displayed) {
-               debug_print("skipping cur (%p %p)\n",
-                       summaryview->displayed, summaryview->selected);
-               skip_cur = TRUE;
-       }
 
-       node = summary_find_next_flagged_msg
-               (summaryview, node, MSG_MARKED, skip_cur);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_next_flagged_msg
+                       (summaryview, node, MSG_MARKED, TRUE);
+       else
+               node = summary_find_prev_flagged_msg
+                       (summaryview, node, MSG_MARKED, TRUE);
        
        if (node)
                summary_select_node(summaryview, node, -1);
        else {
-               node = summary_find_next_flagged_msg
-                       (summaryview, NULL, MSG_MARKED, FALSE);
-               if (node == NULL || node == summaryview->selected) {
-                       AlertValue val = 0;
-
-                       switch (prefs_common.next_unread_msg_dialog) {
-                               case NEXTUNREADMSGDIALOG_ALWAYS:
-                                       val = alertpanel(_("No more marked messages"),
-                                                        _("No marked message found. "
-                                                          "Go to next folder?"),
-                                                        GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
-                                       break;
-                               case NEXTUNREADMSGDIALOG_ASSUME_YES:
-                                       val = G_ALERTALTERNATE;
-                                       break;
-                               case NEXTUNREADMSGDIALOG_ASSUME_NO:
-                                       val = G_ALERTOTHER;
-                                       break;
-                               default:
-                                       debug_print(
-                                               _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
-                       }
-
-                       if (val == G_ALERTALTERNATE) {
-                               folderview_select_next_with_flag(summaryview->folderview, MSG_MARKED);
-                               return;
-                       } 
-                       else
-                               return;
-               } else
-                       summary_select_node(summaryview, node, -1);
+               AlertValue val = 0;
 
+               switch (prefs_common.next_unread_msg_dialog) {
+                       case NEXTUNREADMSGDIALOG_ALWAYS:
+                               val = alertpanel(_("No more marked messages"),
+                                                _("No marked message found. "
+                                                  "Go to next folder?"),
+                                                GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+                               break;
+                       case NEXTUNREADMSGDIALOG_ASSUME_YES:
+                               val = G_ALERTALTERNATE;
+                               break;
+                       case NEXTUNREADMSGDIALOG_ASSUME_NO:
+                               val = G_ALERTOTHER;
+                               break;
+                       default:
+                               debug_print(
+                                       _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+               }
+               if (val == G_ALERTALTERNATE)
+                       folderview_select_next_with_flag(summaryview->folderview, MSG_MARKED);
        }
 }
 
@@ -2095,8 +2077,12 @@ void summary_select_prev_labeled(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node;
 
-       node = summary_find_prev_flagged_msg
-               (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_prev_flagged_msg
+                       (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
+       else
+               node = summary_find_next_flagged_msg
+                       (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
 
        if (!node) {
                AlertValue val;
@@ -2120,8 +2106,12 @@ void summary_select_next_labeled(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node;
 
-       node = summary_find_next_flagged_msg
-               (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_next_flagged_msg
+                       (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
+       else
+               node = summary_find_prev_flagged_msg
+                       (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
 
        if (!node) {
                AlertValue val;
@@ -2131,8 +2121,12 @@ void summary_select_next_labeled(SummaryView *summaryview)
                                   "Search from the beginning?"),
                                 GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
                if (val != G_ALERTALTERNATE) return;
-               node = summary_find_next_flagged_msg(summaryview, NULL,
-                                                    MSG_CLABEL_FLAG_MASK, TRUE);
+               if (summaryview->sort_type == SORT_ASCENDING)
+                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                            MSG_CLABEL_FLAG_MASK, TRUE);
+               else
+                       node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                                            MSG_CLABEL_FLAG_MASK, TRUE);
        }
 
        if (!node)
@@ -2223,6 +2217,7 @@ static gboolean summary_select_retry(void *data)
  * 1, display the corresponding message in the message view, if
  * @force_display is -1, obey prefs_common.always_show_msg.
  **/
+
 void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
                         gint force_display)
 {
@@ -2230,7 +2225,7 @@ void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
        gboolean display_msg;
        
        display_msg = force_display > -1? force_display :
-               (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
+               (prefs_common.always_show_msg == OPENMSG_YES) ||
                ((prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
                                messageview_is_visible(summaryview->messageview)));
 
@@ -2257,7 +2252,6 @@ void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
        if (!summaryview->folder_item)
                return;
        if (node) {
-               summary_cancel_mark_read_timeout(summaryview);
                gtkut_ctree_expand_parent_all(ctree, node);
 
                summary_lock(summaryview);
@@ -4039,6 +4033,24 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
                msginfo->msgnum);
 }
 
+static void summary_mark_row_as_unread(SummaryView *summaryview,
+                                    GtkCMCTreeNode *row)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       MsgInfo *msginfo;
+
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
+       cm_return_if_fail(msginfo);
+
+       if(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags))
+               return;
+
+       summary_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
+       summary_set_row_marks(summaryview, row);
+       debug_print("Message %d is marked as unread\n",
+               msginfo->msgnum);
+}
+
 void summary_mark_as_read(SummaryView *summaryview)
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
@@ -4058,6 +4070,25 @@ void summary_mark_as_read(SummaryView *summaryview)
        summary_status_show(summaryview);
 }
 
+void summary_mark_as_unread(SummaryView *summaryview)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GList *cur;
+       gboolean froze = FALSE;
+
+       if (summary_is_locked(summaryview))
+               return;
+       START_LONG_OPERATION(summaryview, FALSE);
+       folder_item_set_batch(summaryview->folder_item, TRUE);
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               summary_mark_row_as_unread(summaryview,
+                                        GTK_CMCTREE_NODE(cur->data));
+       folder_item_set_batch(summaryview->folder_item, FALSE);
+       END_LONG_OPERATION(summaryview);
+       
+       summary_status_show(summaryview);
+}
+
 void summary_msgs_lock(SummaryView *summaryview)
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
@@ -4092,17 +4123,19 @@ void summary_msgs_unlock(SummaryView *summaryview)
        summary_status_show(summaryview);
 }
 
-void summary_mark_all_read(SummaryView *summaryview)
+void summary_mark_all_read(SummaryView *summaryview, gboolean ask_if_needed)
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GtkCMCTreeNode *node;
        AlertValue val;
        gboolean froze = FALSE;
 
-       if (prefs_common.ask_mark_all_read) {
+       /* ask_if_needed is FALSE when user-asking is performed by caller,
+          commonly when the caller is a mark-as-read-recursive func */
+       if (ask_if_needed && 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, GTK_STOCK_YES, NULL,
+                         _("Do you really want to mark all mails in this folder as read?"),
+                         GTK_STOCK_NO, GTK_STOCK_YES, NULL,
                          TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
                if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -4129,6 +4162,45 @@ void summary_mark_all_read(SummaryView *summaryview)
        summary_status_show(summaryview);
 }
 
+void summary_mark_all_unread(SummaryView *summaryview, gboolean ask_if_needed)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
+       AlertValue val;
+       gboolean froze = FALSE;
+
+       /* ask_if_needed is FALSE when user-asking is performed by caller,
+          commonly when the caller is a mark-as-unread-recursive func */
+       if (ask_if_needed && prefs_common.ask_mark_all_read) {
+               val = alertpanel_full(_("Mark all as unread"),
+                         _("Do you really want to mark all mails in this folder as unread?"),
+                         GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+                         TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
+
+               if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
+                       return;
+               else if (val & G_ALERTDISABLE)
+                       prefs_common.ask_mark_all_read = FALSE;
+       }
+       
+       if (summary_is_locked(summaryview))
+               return;
+       START_LONG_OPERATION(summaryview, TRUE);
+       folder_item_set_batch(summaryview->folder_item, TRUE);
+       for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
+            node = gtkut_ctree_node_next(ctree, node))
+               summary_mark_row_as_unread(summaryview, node);
+       folder_item_set_batch(summaryview->folder_item, FALSE);
+       for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
+            node = gtkut_ctree_node_next(ctree, node)) {
+               if (!GTK_CMCTREE_ROW(node)->expanded)
+                       summary_set_row_marks(summaryview, node);
+       }
+       END_LONG_OPERATION(summaryview);
+       
+       summary_status_show(summaryview);
+}
+
 void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *widget)
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
@@ -4196,48 +4268,6 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
        summary_status_show(summaryview);       
 }
 
-
-static void summary_mark_row_as_unread(SummaryView *summaryview,
-                                      GtkCMCTreeNode *row)
-{
-       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
-       MsgInfo *msginfo;
-
-       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       cm_return_if_fail(msginfo);
-       if (MSG_IS_DELETED(msginfo->flags)) {
-               procmsg_msginfo_set_to_folder(msginfo, NULL);
-               summary_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
-               summaryview->deleted--;
-       }
-
-       summary_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
-       debug_print("Message %d is marked as unread\n",
-               msginfo->msgnum);
-
-       summary_set_row_marks(summaryview, row);
-}
-
-void summary_mark_as_unread(SummaryView *summaryview)
-{
-       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
-       GList *cur;
-       gboolean froze = FALSE;
-
-       if (summary_is_locked(summaryview))
-               return;
-       START_LONG_OPERATION(summaryview, FALSE);
-       folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
-               cur = cur->next)
-               summary_mark_row_as_unread(summaryview,
-                                          GTK_CMCTREE_NODE(cur->data));
-       folder_item_set_batch(summaryview->folder_item, FALSE);
-       END_LONG_OPERATION(summaryview);
-       
-       summary_status_show(summaryview);
-}
-
 static gboolean check_permission(SummaryView *summaryview, MsgInfo * msginfo)
 {
        GList * cur;
@@ -4946,8 +4976,7 @@ gboolean summary_execute(SummaryView *summaryview)
 
        if (new_selected) {
                summary_unlock(summaryview);
-               gtk_sctree_select
-                       (GTK_SCTREE(ctree), new_selected);
+               summary_select_node(summaryview, new_selected, -1);
                summary_lock(summaryview);
        }
 
@@ -5047,8 +5076,7 @@ gboolean summary_expunge(SummaryView *summaryview)
 
        if (new_selected) {
                summary_unlock(summaryview);
-               gtk_sctree_select
-                       (GTK_SCTREE(ctree), new_selected);
+               summary_select_node(summaryview, new_selected, -1);
                summary_lock(summaryview);
        }
 
@@ -5504,7 +5532,7 @@ void summary_collapse_threads(SummaryView *summaryview)
        while (node && GTK_CMCTREE_ROW(node)->parent) {
                focus_node = node = GTK_CMCTREE_ROW(node)->parent;
        }
-       gtk_sctree_select(GTK_SCTREE(ctree), focus_node);
+       summary_select_node(summaryview, node, -1);
        node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
        while (node) {
                if (GTK_CMCTREE_ROW(node)->children) {
@@ -6662,7 +6690,6 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        MessageView *messageview;
        GtkAdjustment *adj;
        gboolean mod_pressed;
-       gfloat row_align = 0;
 
        if (!event) 
                return TRUE;
@@ -6753,7 +6780,6 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                case GDK_KEY_End: case GDK_KEY_KP_End:
                                        next = gtk_cmctree_node_nth(ctree,
                                                        g_list_length(GTK_CMCLIST(ctree)->row_list)-1);
-                                       row_align = 1;
                                        break;
                                case GDK_KEY_Up: case GDK_KEY_KP_Up:
                                        next = gtk_cmctree_node_nth(ctree,
@@ -6762,7 +6788,6 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                case GDK_KEY_Down: case GDK_KEY_KP_Down:
                                        next = gtk_cmctree_node_nth(ctree,
                                                        MIN(GTK_CMCLIST(ctree)->focus_row + 1, GTK_CMCLIST(ctree)->rows));
-                                       row_align = 1;
                                        break;
                                case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
                                        next = gtk_cmctree_node_nth(ctree,
@@ -6777,7 +6802,6 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                                                (2 * GTK_CMCLIST(ctree)->clist_window_height -
                                                                 GTK_CMCLIST(ctree)->row_height - CELL_SPACING) /
                                                                (2 * (GTK_CMCLIST(ctree)->row_height + CELL_SPACING))));
-                                       row_align = 1;
                                        break;
                        }
 
@@ -6787,7 +6811,9 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
                                /* Deprecated - what are the non-deprecated equivalents? */
                                if (gtk_cmctree_node_is_visible(GTK_CMCTREE(ctree), next) != GTK_VISIBILITY_FULL)
-                                       gtk_cmctree_node_moveto(GTK_CMCTREE(ctree), next, 0, row_align, 0);
+                                       gtkut_ctree_node_move_if_on_the_edge(GTK_CMCTREE(ctree), next, -1);
+                               if (!mod_pressed)
+                                       summary_select_node(summaryview, summaryview->selected, -1);
                                summaryview->selected = next;
                        }
                }
@@ -7768,6 +7794,7 @@ void summary_toggle_watch_thread(SummaryView *summaryview)
                summary_watch_thread(summaryview);
 }
 
+
 void summary_toggle_show_read_messages(SummaryView *summaryview)
 {
        FolderItemUpdateData source;