2005-11-18 [cleroy] 1.9.100cvs18

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 081af0a3ad1e44de2a3e5c908ede35a50c34bb7d..91f5be1c02801d0ab478a3be82159392b07c63a8 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1610,7 +1610,7 @@ void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
                                g_warning("crash avoidance hack 2\n");
                                return;
                        }
-                       gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+                       gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
                }
                summary_unselect_all(summaryview);
                if (display_msg && summaryview->displayed == node)
@@ -1824,7 +1824,7 @@ void summary_attract_by_subject(SummaryView *summaryview)
 
        g_hash_table_destroy(subject_table);
 
-       gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+       gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 
        gtk_clist_thaw(clist);
 
@@ -1894,8 +1894,8 @@ static void summary_status_show(SummaryView *summaryview)
        gchar *spc;
        gchar *itstr;
        GList *rowlist, *cur;
-       guint n_selected = 0;
-       off_t sel_size = 0;
+       guint n_selected = 0, n_new = 0, n_unread = 0, n_total = 0;
+       off_t sel_size = 0, n_size = 0;
        MsgInfo *msginfo;
        gchar *name;
        
@@ -1916,7 +1916,33 @@ static void summary_status_show(SummaryView *summaryview)
                else {
                        sel_size += msginfo->size;
                        n_selected++;
+                       
+               }
+       }
+       
+       if (summaryview->folder_item->hide_read_msgs 
+       || quicksearch_is_active(summaryview->quicksearch)) {
+               rowlist = GTK_CLIST(summaryview->ctree)->row_list;
+               for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
+                       msginfo = gtk_ctree_node_get_row_data
+                               (GTK_CTREE(summaryview->ctree),
+                                GTK_CTREE_NODE(cur));
+                       if (!msginfo)
+                               g_warning("summary_status_show(): msginfo == NULL\n");
+                       else {
+                               n_size += msginfo->size;
+                               n_total++;
+                               if (MSG_IS_NEW(msginfo->flags))
+                                       n_new++;
+                               if (MSG_IS_UNREAD(msginfo->flags))
+                                       n_unread++;
+                       }
                }
+       } else {
+               n_new = summaryview->folder_item->new_msgs;
+               n_unread = summaryview->folder_item->unread_msgs;
+               n_total = summaryview->folder_item->total_msgs;
+               n_size = summaryview->total_size;
        }
 
        name = folder_item_get_name(summaryview->folder_item);
@@ -1969,10 +1995,8 @@ static void summary_status_show(SummaryView *summaryview)
 
        str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
 
-                                     summaryview->folder_item->new_msgs,
-                                     summaryview->folder_item->unread_msgs,
-                                     summaryview->folder_item->total_msgs,
-                                     to_human_readable(summaryview->total_size));
+                                     n_new, n_unread, n_total,
+                                     to_human_readable(n_size));
        gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
        g_free(str);
 }
@@ -2179,7 +2203,7 @@ void summary_sort(SummaryView *summaryview,
 
                gtk_sctree_sort_recursive(ctree, NULL);
 
-               gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+               gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 
                main_window_cursor_normal(summaryview->mainwin);
                 gtk_clist_thaw(clist);
@@ -3768,7 +3792,7 @@ gboolean summary_execute(SummaryView *summaryview)
        summary_update_status(summaryview);
        summary_status_show(summaryview);
 
-       gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+       gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 
        summary_unlock(summaryview);
        
@@ -4112,7 +4136,7 @@ void summary_expand_threads(SummaryView *summaryview)
 
        summaryview->thread_collapsed = FALSE;
 
-       gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+       gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 }
 
 void summary_collapse_threads(SummaryView *summaryview)
@@ -4132,7 +4156,7 @@ void summary_collapse_threads(SummaryView *summaryview)
        
        summaryview->thread_collapsed = TRUE;
 
-       gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+       gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 }
 
 void summary_filter(SummaryView *summaryview, gboolean selected_only)