2007-06-12 [colin] 2.9.2cvs57

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index d61f64b88f7d082fdee5a0ff779dcb158d101c9d..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;
 }
 
@@ -1101,7 +1101,7 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
                                        GTK_SCROLLED_WINDOW(folderview->scrolledwin));
                gtk_adjustment_set_value(pos, height);
        }
-       gtk_widget_destroy(window);
+       label_window_destroy(window);
        inc_unlock();
 }
 
@@ -1141,7 +1141,7 @@ void folderview_fast_rescan_tree(Folder *folder)
                                        GTK_SCROLLED_WINDOW(folderview->scrolledwin));
                gtk_adjustment_set_value(pos, height);
        }
-       gtk_widget_destroy(window);
+       label_window_destroy(window);
        inc_unlock();
 }
 
@@ -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);
@@ -1269,7 +1270,7 @@ void folderview_check_new_all(void)
        folder_write_list();
        folderview_set_all();
 
-       gtk_widget_destroy(window);
+       label_window_destroy(window);
        main_window_unlock(folderview->mainwin);
        inc_unlock();
 }
@@ -1621,9 +1622,9 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], "-");
                gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  "-");
        } else {
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW],    itos(item->new_msgs));
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], itos(item->unread_msgs));
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  itos(item->total_msgs));
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW],    item->new_msgs    > 0 ? itos(item->new_msgs)    : prefs_common.zero_replacement);
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], item->unread_msgs > 0 ? itos(item->unread_msgs) : prefs_common.zero_replacement);
+               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  item->total_msgs  > 0 ? itos(item->total_msgs)  : prefs_common.zero_replacement);
        }
 
        if (folder_has_parent_of_type(item, F_OUTBOX) ||
@@ -2004,12 +2005,24 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                return FALSE;
 
        switch (event->keyval) {
+       case GDK_Right:
+#ifndef MAEMO
        case GDK_Return:
+#endif
                if (folderview->selected) {
                        folderview_select_node(folderview,
                                               folderview->selected);
                }
                break;
+#ifdef MAEMO
+       case GDK_Return:
+               if (folderview->selected && GTK_CTREE_ROW(folderview->selected)->children) {
+                       gtk_ctree_toggle_expansion(
+                               GTK_CTREE(folderview->ctree),
+                               folderview->selected);
+               }
+               break;  
+#endif
        case GDK_space:
                if (folderview->selected) {
                        if (folderview->opened == folderview->selected &&
@@ -2069,6 +2082,11 @@ void folderview_close_opened(FolderView *folderview)
                        STATUSBAR_POP(folderview->mainwin);
                }
        }
+
+       if (folderview->opened &&
+           !GTK_CTREE_ROW(folderview->opened)->children)
+               gtk_ctree_collapse(folderview->ctree, folderview->opened);
+
        folderview->opened = NULL;
 }
 static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
@@ -2079,6 +2097,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        FolderItem *item;
        gchar *buf;
        int res = 0;
+       GtkCTreeNode *old_opened = folderview->opened;
        START_TIMING("");
        folderview->selected = row;
 
@@ -2115,8 +2134,9 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        /* Save cache for old folder */
        /* We don't want to lose all caches if sylpheed crashed */
+       /* resets folderview->opened to NULL */
        folderview_close_opened(folderview);
-
+       
        /* CLAWS: set compose button type: news folder items 
         * always have a news folder as parent */
        if (item->folder) 
@@ -2130,9 +2150,6 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        if (!GTK_CTREE_ROW(row)->children)
                gtk_ctree_expand(ctree, row);
-       if (folderview->opened &&
-           !GTK_CTREE_ROW(folderview->opened)->children)
-               gtk_ctree_collapse(ctree, folderview->opened);
 
        /* ungrab the mouse event */
        if (GTK_WIDGET_HAS_GRAB(ctree)) {
@@ -2185,8 +2202,9 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        folder_clean_cache_memory(item);
 
        if (!opened) {
-               gtkut_ctree_set_focus_row(ctree, folderview->opened);
-               gtk_ctree_select(ctree, folderview->opened);
+               gtkut_ctree_set_focus_row(ctree, old_opened);
+               gtk_ctree_select(ctree, old_opened);
+               folderview->opened = old_opened;
        } else {
                folderview->opened = row;
                if (gtk_ctree_node_is_visible(ctree, row)
@@ -2523,6 +2541,21 @@ static gint folderview_clist_compare(GtkCList *clist,
        FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
        FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
 
+       if (item1->order > 0 && item2->order > 0)  // if we have an order item, use it
+       {
+               return item1->order - item2->order;
+       }
+
+       // if only one folder has an order it comes first
+       if (item1->order > 0)
+       {
+               return -1;
+       }
+       if (item2->order > 0)
+       {
+               return 1;
+       }
+
        if (!item1->name)
                return (item2->name != NULL);
        if (!item2->name)