2006-08-26 [wwp] 2.4.0cvs93

	* src/summary_search.c
		disable find buttons while summary search is running.

diff --git a/ChangeLog b/ChangeLog
index 30212973cab50b7d448bb10ab7f7c91d60e34508..99c25c6ceff56944d1460920ff2ba855f1c36a9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-26 [wwp]       2.4.0cvs93
+
+       * src/summary_search.c
+               disable find buttons while summary search is running.
+
 2006-08-25 [colin]     2.4.0cvs92
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index d3461c5d604c106cd3f2bca71b939c26f8c16270..5293e727f33c2d0fc1258f0afd5d43f4d9da1422 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1784,3 +1784,4 @@
 ( cvs diff -u -r 1.155.2.40 -r 1.155.2.41 src/Makefile.am;  cvs diff -u -r 1.25.2.26 -r 1.25.2.27 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.17 -r 1.18.2.18 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.232 -r 1.395.2.233 src/summaryview.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/icon_legend.c;  diff -u /dev/null src/pixmaps/copied.xpm;  diff -u /dev/null src/pixmaps/moved.xpm;  ) > 2.4.0cvs90.patchset
 ( cvs diff -u -r 1.395.2.233 -r 1.395.2.234 src/summaryview.c;  ) > 2.4.0cvs91.patchset
 ( cvs diff -u -r 1.213.2.108 -r 1.213.2.109 src/folder.c;  cvs diff -u -r 1.3.2.11 -r 1.3.2.12 src/folderutils.c;  cvs diff -u -r 1.79.2.38 -r 1.79.2.39 src/mh.c;  cvs diff -u -r 1.16.2.36 -r 1.16.2.37 src/msgcache.c;  cvs diff -u -r 1.60.2.32 -r 1.60.2.33 src/procmsg.h;  cvs diff -u -r 1.395.2.234 -r 1.395.2.235 src/summaryview.c;  ) > 2.4.0cvs92.patchset
+( cvs diff -u -r 1.15.2.30 -r 1.15.2.31 src/summary_search.c;  ) > 2.4.0cvs93.patchset

diff --git a/configure.ac b/configure.ac
index af67985f71cf3781a409f42d34569dfa3b162e0a..5cd7f74f17e8aac76731267e20de801cafd7bdcb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=92
+EXTRA_VERSION=93
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summary_search.c b/src/summary_search.c
index c4e30343e2bdd2232681cd4df3daf02ba6434da6..fb8b10f921296de43952656dfac3488484e90ea5 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -133,6 +133,24 @@ void summary_search(SummaryView *summaryview)
        gtk_widget_show(search_window.window);
 }
 
+static void summary_show_stop_button(void)
+{
+       gtk_widget_hide(search_window.close_btn);
+       gtk_widget_show(search_window.stop_btn);
+       gtk_widget_set_sensitive(search_window.all_btn, FALSE);
+       gtk_widget_set_sensitive(search_window.prev_btn, FALSE);
+       gtk_widget_set_sensitive(search_window.next_btn, FALSE);
+}
+
+static void summary_hide_stop_button(void)
+{
+       gtk_widget_hide(search_window.stop_btn);
+       gtk_widget_show(search_window.close_btn);
+       gtk_widget_set_sensitive(search_window.all_btn, TRUE);
+       gtk_widget_set_sensitive(search_window.prev_btn, TRUE);
+       gtk_widget_set_sensitive(search_window.next_btn, TRUE);
+}
+
 static void summary_search_create(void)
 {
        GtkWidget *window;
@@ -459,8 +477,7 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
 
        search_window.is_searching = TRUE;
        main_window_cursor_wait(summaryview->mainwin);
-       gtk_widget_hide(search_window.close_btn);
-       gtk_widget_show(search_window.stop_btn);
+       summary_show_stop_button();
 
        if (search_all) {
                gtk_clist_freeze(GTK_CLIST(ctree));
@@ -476,8 +493,7 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
 
                if (!node) {
                        search_window.is_searching = FALSE;
-                       gtk_widget_hide(search_window.stop_btn);
-                       gtk_widget_show(search_window.close_btn);
+                       summary_hide_stop_button();
                        main_window_cursor_normal(summaryview->mainwin);
                        summary_unlock(summaryview);
                        return;
@@ -628,8 +644,7 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
        }
 
        search_window.is_searching = FALSE;
-       gtk_widget_hide(search_window.stop_btn);
-       gtk_widget_show(search_window.close_btn);
+       summary_hide_stop_button();
        main_window_cursor_normal(summaryview->mainwin);
        if (search_all) {
                gtk_clist_thaw(GTK_CLIST(ctree));