2007-06-12 [colin] 2.9.2cvs57

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index ddc831dadbd74b27df0f7c70af8b66173f0652d2..f53d945acb253299f96b28512597cefe267f134f 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -889,10 +889,10 @@ void folderview_select_next_marked(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
-       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
        gboolean last_open = prefs_common.always_show_msg;
        
-       prefs_common.select_on_entry = SELECTONENTRY_MNU;
+       prefs_common.summary_select_prio[0] = ACTION_MARKED;
        prefs_common.always_show_msg = TRUE;
 
        if ((node = folderview_find_next_marked(ctree, folderview->opened))
@@ -910,7 +910,7 @@ void folderview_select_next_marked(FolderView *folderview)
                folderview_select_node(folderview, node);
 
 out:
-       prefs_common.select_on_entry = last_sel;
+       prefs_common.summary_select_prio[0] = last_summary_select_prio;
        prefs_common.always_show_msg = last_open;
 }
 
@@ -937,10 +937,10 @@ void folderview_select_next_unread(FolderView *folderview, gboolean force_open)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
-       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
        gboolean last_open = prefs_common.always_show_msg;
        
-       prefs_common.select_on_entry = SELECTONENTRY_UNM;
+       prefs_common.summary_select_prio[0] = ACTION_UNREAD;
        prefs_common.always_show_msg = force_open ? TRUE : last_open;
 
        if ((node = folderview_find_next_unread(ctree, folderview->opened))
@@ -958,7 +958,7 @@ void folderview_select_next_unread(FolderView *folderview, gboolean force_open)
                folderview_select_node(folderview, node);
 
 out:
-       prefs_common.select_on_entry = last_sel;
+       prefs_common.summary_select_prio[0] = last_summary_select_prio;
        prefs_common.always_show_msg = last_open;
 }
 
@@ -985,10 +985,10 @@ void folderview_select_next_new(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
-       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
        gboolean last_open = prefs_common.always_show_msg;
        
-       prefs_common.select_on_entry = SELECTONENTRY_NUM;
+       prefs_common.summary_select_prio[0] = ACTION_NEW;
        prefs_common.always_show_msg = TRUE;
 
        if ((node = folderview_find_next_new(ctree, folderview->opened))
@@ -1006,7 +1006,7 @@ void folderview_select_next_new(FolderView *folderview)
                folderview_select_node(folderview, node);
 
 out:
-       prefs_common.select_on_entry = last_sel;
+       prefs_common.summary_select_prio[0] = last_summary_select_prio;
        prefs_common.always_show_msg = last_open;
 }
 
@@ -1206,6 +1206,7 @@ gint folderview_check_new(Folder *folder)
                                                if (FOLDER_TYPE(item->folder) == F_NEWS || FOLDER_IS_LOCAL(folder)) {
                                                        log_error(LOG_PROTOCOL, _("Couldn't scan folder %s\n"),
                                                                item->path ? item->path:item->name);
+                                                       STATUSBAR_POP(folderview->mainwin);
                                                        continue;
                                                } else if (!FOLDER_IS_LOCAL(folder)) {
                                                        STATUSBAR_POP(folderview->mainwin);