Move all colors into an array

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index d48a8de9a5e3bdad0f9682b04c28002ae4cb9a00..db179028f4d68dc97c3fe123bccc7f41c6a94d80 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -708,13 +708,13 @@ void folderview_init(FolderView *folderview)
                                        (normal_style->font_desc);
                        normal_style->font_desc = font_desc;
                }
-               gtkut_convert_int_to_gdk_color(prefs_common.color_new, &gdk_color);
+               gtkut_convert_int_to_gdk_color(prefs_common.color[COL_NEW], &gdk_color);
                normal_color_style = gtk_style_copy(normal_style);
                normal_color_style->fg[GTK_STATE_NORMAL] = gdk_color;
        }
 
        if (!bold_style) {
-               gtkut_convert_int_to_gdk_color(prefs_common.color_new, &gdk_color);
+               gtkut_convert_int_to_gdk_color(prefs_common.color[COL_NEW], &gdk_color);
                bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
                if (prefs_common.derive_from_normal_font || !BOLD_FONT) {
                        PangoFontDescription *font_desc;
@@ -932,7 +932,7 @@ static void folderview_select_node(FolderView *folderview, GtkCMCTreeNode *node)
            folderview->summaryview->folder_item->total_msgs > 0) ||
             prefs_common.layout_mode == SMALL_LAYOUT)
                summary_select_node(folderview->summaryview,
-                                   folderview->summaryview->selected, -1);
+                                   folderview->summaryview->selected, OPEN_SELECTED_ON_FOLDER_OPEN);
        else
                gtk_widget_grab_focus(folderview->ctree);
 }
@@ -995,16 +995,16 @@ void folderview_select_next_with_flag(FolderView *folderview,
        
        switch (flag) {
        case MSG_UNREAD:
-               prefs_common.summary_select_prio[0] = ACTION_UNREAD;
+               prefs_common.summary_select_prio[0] = ACTION_OLDEST_UNREAD;
                break;
        case MSG_NEW:
-               prefs_common.summary_select_prio[0] = ACTION_NEW;
+               prefs_common.summary_select_prio[0] = ACTION_OLDEST_NEW;
                break;
        case MSG_MARKED:
-               prefs_common.summary_select_prio[0] = ACTION_MARKED;
+               prefs_common.summary_select_prio[0] = ACTION_OLDEST_MARKED;
                break;
        default:
-               prefs_common.summary_select_prio[0] = ACTION_FIRST_LIST;
+               prefs_common.summary_select_prio[0] = ACTION_OLDEST_LIST;
                break;
        }