2005-03-19 [holger] 1.9.6cvs1

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 6726e17cd12f160b6555e7f5e987c14c1b662d9f..3bc45cafcbdd5f5c7acaa724e89284e82f34bbf2 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -641,11 +641,21 @@ void summary_init(SummaryView *summaryview)
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
                         &gpgsignedxpm, &gpgsignedxpmmask);
 
+       font_desc = pango_font_description_from_string(NORMAL_FONT);
+       gtk_widget_modify_font(summaryview->ctree, font_desc);
+       pango_font_description_free(font_desc);
+
        if (!bold_style) {
                bold_style = gtk_style_copy
                        (gtk_widget_get_style(summaryview->ctree));
+               font_desc = pango_font_description_from_string(BOLD_FONT);
+               if (font_desc) {
+                       pango_font_description_free(bold_style->font_desc);
+                       bold_style->font_desc = font_desc;
+               }
+               
                pango_font_description_set_weight
-                       (bold_style->font_desc, PANGO_WEIGHT_BOLD);
+                               (bold_style->font_desc, PANGO_WEIGHT_BOLD);
                bold_marked_style = gtk_style_copy(bold_style);
                bold_marked_style->fg[GTK_STATE_NORMAL] =
                        summaryview->color_marked;
@@ -954,12 +964,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
           create the thread */
        summary_set_ctree_from_list(summaryview, mlist);
 
-       g_slist_free(mlist);
 
-       if (summaryview->sort_key != SORT_BY_NONE) {
-               summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
-               summary_thread_init(summaryview);
-       }
+       g_slist_free(mlist);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 
@@ -2071,6 +2077,9 @@ void summary_sort(SummaryView *summaryview,
 
                main_window_cursor_normal(summaryview->mainwin);
 
+               if (summaryview->threaded)
+                       summary_thread_init(summaryview);
+
                debug_print("done.\n");
                STATUSBAR_POP(summaryview->mainwin);
        }
@@ -2156,8 +2165,6 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                }
 
                g_node_destroy(root);
-
-               summary_thread_init(summaryview);
        } else {
                gchar *text[N_SUMMARY_COLS];
                cur = mlist;
@@ -2205,6 +2212,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                debug_print("\tsubject hash table size = %d\n",
                            g_hash_table_size(subject_table));
        }
+
+       summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
 }
 
 static gchar *summary_complete_address(const gchar *addr)
@@ -2850,6 +2859,11 @@ void summary_mark_all_read(SummaryView *summaryview)
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node))
                summary_mark_row_as_read(summaryview, node);
+       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
+            node = gtkut_ctree_node_next(ctree, node)) {
+               if (!GTK_CTREE_ROW(node)->expanded)
+                       summary_set_row_marks(summaryview, node);
+       }
        folder_item_update_thaw();
        gtk_clist_thaw(clist);
 
@@ -3242,8 +3256,6 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
        folder_item_update_thaw();
        gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
 
-       summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-
        if (prefs_common.immediate_exec)
                summary_execute(summaryview);
        else {
@@ -3723,7 +3735,7 @@ static void summary_thread_init(SummaryView *summaryview)
                while (node) {
                        next = GTK_CTREE_ROW(node)->sibling;
                        if (GTK_CTREE_ROW(node)->children)
-                               gtk_ctree_expand(ctree, node);
+                               gtk_ctree_expand_recursive(ctree, node);
                        node = next;
                }
        } else if (prefs_common.bold_unread) {
@@ -3879,11 +3891,6 @@ void summary_collapse_threads(SummaryView *summaryview)
 
 void summary_filter(SummaryView *summaryview, gboolean selected_only)
 {
-       if (!filtering_rules) {
-               alertpanel_error(_("No filter rules defined."));
-               return;
-       }
-
        summary_lock(summaryview);
 
        folder_item_update_freeze();
@@ -3894,37 +3901,21 @@ void summary_filter(SummaryView *summaryview, gboolean selected_only)
 
        gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
 
-       if (filtering_rules == NULL) {
+       if (selected_only) {
+               GList *cur;
+
+               for (cur = GTK_CLIST(summaryview->ctree)->selection;
+                    cur != NULL; cur = cur->next) {
+                       summary_filter_func(GTK_CTREE(summaryview->ctree),
+                                           GTK_CTREE_NODE(cur->data),
+                                           summaryview);
+               }
+       } else {
                gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
                                        GTK_CTREE_FUNC(summary_filter_func),
                                        summaryview);
-               
-               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-               
-               if (prefs_common.immediate_exec) {
-                       summary_unlock(summaryview);
-                       summary_execute(summaryview);
-                       summary_lock(summaryview);
-               } else
-                       summary_status_show(summaryview);
-       }
-       else {
-               if (selected_only) {
-                       GList *cur;
-
-                       for (cur = GTK_CLIST(summaryview->ctree)->selection;
-                            cur != NULL; cur = cur->next) {
-                               summary_filter_func(GTK_CTREE(summaryview->ctree),
-                                                   GTK_CTREE_NODE(cur->data),
-                                                   summaryview);
-                       }
-               } else {
-                       gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
-                                               GTK_CTREE_FUNC(summary_filter_func),
-                                               summaryview);
-               }
-               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        }
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
 
        folder_item_update_thaw();
        debug_print("done.\n");
@@ -3937,16 +3928,19 @@ void summary_filter(SummaryView *summaryview, gboolean selected_only)
         * CLAWS: summary_show() only valid after having a lock. ideally
         * we want the lock to be context aware...  
         */
-       if (filtering_rules) {
-               summary_show(summaryview, summaryview->folder_item);
-       }               
+       summary_show(summaryview, summaryview->folder_item);
 }
 
 static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
                                gpointer data)
 {
+       MailFilteringData mail_filtering_data;
        MsgInfo *msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
+       mail_filtering_data.msginfo = msginfo;
+       if (hooks_invoke(MAIL_MANUAL_FILTERING_HOOKLIST, &mail_filtering_data))
+               return;
+
        filter_message_by_msginfo(filtering_rules, msginfo);
 }