change gtk_ctree_sort_node() into gtk_ctree_sort_recursive() so messages on same...

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index bfdb8976645c7012f415a8dec239a3e19a0d88ae..35f68211dcd1d2d7d24ddb6ab7942ff1b333a547 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1913,7 +1913,7 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
 
        summary_set_column_titles(summaryview);
 
-       gtk_ctree_sort_node(ctree, NULL);
+       gtk_ctree_sort_recursive(ctree, NULL);
 
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
        prefs_folder_item_set_config(summaryview->folder_item,
@@ -3753,8 +3753,6 @@ void summary_filter(SummaryView *summaryview)
 
                g_hash_table_destroy(summaryview->folder_table);
                summaryview->folder_table = NULL;
-
-               summary_show(summaryview, summaryview->folder_item, FALSE);
        }
 
        debug_print(_("done.\n"));
@@ -3762,6 +3760,11 @@ void summary_filter(SummaryView *summaryview)
        main_window_cursor_normal(summaryview->mainwin);
 
        summary_unlock(summaryview);
+
+       /* CLAWS: summary_show() only valid after having a lock. ideally
+        * we want the lock to be context aware...  */
+       if (global_processing)
+               summary_show(summaryview, summaryview->folder_item, FALSE);
 }
 
 static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3782,7 +3785,7 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
                    summaryview->folder_item != dest)
                        summary_move_row_to(summaryview, node, dest);
        }
-       else
+       else 
                filter_msginfo_move_or_delete(global_processing, msginfo,
                                              summaryview->folder_table);
 }
@@ -4942,7 +4945,7 @@ static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
        GtkWidget *widget;
  
        widget = gtk_item_factory_get_item(gtk_item_factory_from_widget(summaryview->mainwin->menubar),
-                                          "/Summary/Hide read messages");
+                                          "/View/Hide read messages");
        gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
                            GINT_TO_POINTER(1));
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);