freeze clist in summaryview when performing potentially expensive list walking

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0ae55d81bf6d59868d983ddd98c04565017e89c5..ac4fd00ac16b1039d9453453579be9be69eb2b18 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2005-01-24 [colin]     1.0.0cvs13
+
+       * src/summaryview.c
+               Freeze clist during operations involving message
+               lists.
+
 2005-01-24 [paul]      1.0.0cvs12
 
        * ChangeLog

diff --git a/PATCHSETS b/PATCHSETS
index 2e7177db949e63ca4febdc5c7c182c9e8c155b80..800b1cec154f8a3bc1ecc51c866f31b44aab4a70 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -220,3 +220,4 @@
 ( cvs diff -u -r 1.255 -r 1.256 src/folderview.c; ) > 1.0.0cvs10.patchset
 ( cvs diff -u -r 1.61 -r 1.62 src/procheader.c; ) > 1.0.0cvs11.patchset
 ( cvs diff -u -r 1.455 -r 1.456 ChangeLog; cvs diff -u -r 1.450 -r 1.451 ChangeLog.jp; cvs diff -u -r 1.128 -r 1.129 src/messageview.c; cvs diff -u -r 1.86 -r 1.87 src/mh.c; cvs diff -u -r 1.61 -r 1.62 src/common/utils.c; ) > 1.0.0cvs12.patchset
+( cvs diff -u -r 1.456 -r 1.457 src/summaryview.c; ) > 1.0.0cvs13.patchset

diff --git a/configure.ac b/configure.ac
index 53f4e9a09c912a4a3bdf48498cd36098cc0f7a32..ff552c6aa5df4f423e4a185c166fa348cdf20050 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/summaryview.c b/src/summaryview.c
index fd3a37bcbf2b9893d477f57eb6c519ca971411f4..fc32c317cb502dcc068fa1887210cc0b211afd6d 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2815,11 +2815,13 @@ void summary_mark_as_read(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_mark_row_as_read(summaryview,
                                         GTK_CTREE_NODE(cur->data));
        folder_item_update_thaw();
-       
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summary_status_show(summaryview);
 }
 
@@ -2829,10 +2831,12 @@ void summary_msgs_lock(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_lock_row(summaryview,
                                         GTK_CTREE_NODE(cur->data));
        folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        
        summary_status_show(summaryview);
 }
@@ -2843,10 +2847,12 @@ void summary_msgs_unlock(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_unlock_row(summaryview,
                                   GTK_CTREE_NODE(cur->data));
        folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        
        summary_status_show(summaryview);
 }
@@ -2898,10 +2904,12 @@ void summary_mark_as_unread(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_mark_row_as_unread(summaryview,
                                           GTK_CTREE_NODE(cur->data));
        folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        
        summary_status_show(summaryview);
 }
@@ -3050,12 +3058,14 @@ void summary_delete(SummaryView *summaryview)
 
        /* next code sets current row focus right. We need to find a row
         * that is not deleted. */
-       folder_item_update_freeze();     
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
                sel_last = GTK_CTREE_NODE(cur->data);
                summary_delete_row(summaryview, sel_last);
        }
        folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
 
        node = summary_find_next_msg(summaryview, sel_last);
        if (!node)
@@ -3420,11 +3430,13 @@ gboolean summary_execute(SummaryView *summaryview)
                summary_unthread_for_exec(summaryview);
 
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        summary_execute_move(summaryview);
        summary_execute_copy(summaryview);
        summary_execute_delete(summaryview);
        folder_item_update_thaw();
-
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       
        node = GTK_CTREE_NODE(clist->row_list);
        for (; node != NULL; node = next) {
                next = gtkut_ctree_node_next(ctree, node);
@@ -4046,10 +4058,12 @@ void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
 
        main_window_cursor_wait(summaryview->mainwin);
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_set_row_colorlabel(summaryview,
                                           GTK_CTREE_NODE(cur->data), labelcolor);
        folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        main_window_cursor_normal(summaryview->mainwin);
 }
 
@@ -4965,14 +4979,15 @@ static void summary_ignore_thread(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
-
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), 
                                        GTK_CTREE_FUNC(summary_ignore_thread_func), 
                                        summaryview);
 
        folder_item_update_thaw();
-
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       
        summary_status_show(summaryview);
 }
 
@@ -4999,14 +5014,14 @@ static void summary_unignore_thread(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
-
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), 
                                        GTK_CTREE_FUNC(summary_unignore_thread_func), 
                                        summaryview);
 
        folder_item_update_thaw();
-
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        summary_status_show(summaryview);
 }