2006-09-19 [wwp] 2.4.0cvs198

	* src/summary_search.c
		fix can't click forward/backward buttons in the
		search messages.

diff --git a/ChangeLog b/ChangeLog
index 6ad46af3b1849b3b7a60115c2d937e1453fc9419..7e5e1b44e7c7bce0917eac2f122b7afbab233162 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-19 [wwp]       2.4.0cvs198
+
+       * src/summary_search.c
+               fix can't click forward/backward buttons in the
+               search messages.
+
 2006-09-18 [paul]      2.4.0cvs197
 
        * src/wizard.c

diff --git a/PATCHSETS b/PATCHSETS
index 4b39f307cbf19204509f9783b3241795ecadd586..9d4d255f21a4c6ed93becc7220d2e5f638cb1af9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1889,3 +1889,4 @@
 ( cvs diff -u -r 1.207.2.120 -r 1.207.2.121 src/folderview.c;  ) > 2.4.0cvs195.patchset
 ( cvs diff -u -r 1.382.2.307 -r 1.382.2.308 src/compose.c;  ) > 2.4.0cvs196.patchset
 ( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/wizard.c;  ) > 2.4.0cvs197.patchset
+( cvs diff -u -r 1.15.2.32 -r 1.15.2.33 src/summary_search.c;  ) > 2.4.0cvs198.patchset

diff --git a/configure.ac b/configure.ac
index 696323e2378a6ecb239ce0bbf6cb2f9d7630634d..ebf33a94e0cf9d744b15a3955caf6f20be302a19 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=197
+EXTRA_VERSION=198
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summary_search.c b/src/summary_search.c
index 37479b7fd19ab6981bd80f28f26f12db90d78906..22b80e3810daf9d06cd4b08a5f8da2b8578e5028 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -118,6 +118,15 @@ static gboolean key_pressed                (GtkWidget      *widget,
                                         gpointer        data);
 
 
+#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) {   \
+       gboolean in_btn = FALSE;                                                        \
+       if (GTK_IS_BUTTON(widget))                                                      \
+               in_btn = GTK_BUTTON(widget)->in_button;                 \
+       gtk_widget_set_sensitive(widget, sensitive);            \
+       if (GTK_IS_BUTTON(widget))                                                      \
+               GTK_BUTTON(widget)->in_button = in_btn;                 \
+}
+
 void summary_search(SummaryView *summaryview)
 {
        if (!search_window.window) {
@@ -137,9 +146,9 @@ 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);
+       GTK_BUTTON_SET_SENSITIVE(search_window.all_btn, FALSE)
+       GTK_BUTTON_SET_SENSITIVE(search_window.prev_btn, FALSE)
+       GTK_BUTTON_SET_SENSITIVE(search_window.next_btn, FALSE)
 }
 
 static void summary_hide_stop_button(void)