2007-08-27 [colin] 2.10.0cvs178

	* src/summaryview.c
		Fix Quicksearch's Sticky mode

diff --git a/ChangeLog b/ChangeLog
index b572638213b029235228d7bdfd52e489d7696056..eb6e1d30c3504696ed3af08df38f519b065373f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-27 [colin]     2.10.0cvs178
+
+       * src/summaryview.c
+               Fix Quicksearch's Sticky mode
+
 2007-08-27 [colin]     2.10.0cvs177
 
        * src/folder_item_prefs.c

diff --git a/PATCHSETS b/PATCHSETS
index 360c2fa89cc09d8483b0dcb88db677ab86336b2a..90fe5653a2ecd3579e9a0ff92995de12dbf89929 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2832,3 +2832,4 @@
 ( cvs diff -u -r 1.60.2.49 -r 1.60.2.50 src/prefs_actions.c;  ) > 2.10.0cvs175.patchset
 ( cvs diff -u -r 1.17.2.37 -r 1.17.2.38 src/alertpanel.c;  cvs diff -u -r 1.94.2.148 -r 1.94.2.149 src/messageview.c;  cvs diff -u -r 1.60.2.50 -r 1.60.2.51 src/prefs_actions.c;  ) > 2.10.0cvs176.patchset
 ( cvs diff -u -r 1.2.2.22 -r 1.2.2.23 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/folder_item_prefs.h;  cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/imap_gtk.c;  cvs diff -u -r 1.2.2.27 -r 1.2.2.28 src/mh_gtk.c;  ) > 2.10.0cvs177.patchset
+( cvs diff -u -r 1.395.2.321 -r 1.395.2.322 src/summaryview.c;  ) > 2.10.0cvs178.patchset

diff --git a/configure.ac b/configure.ac
index 0036a58b8002c6566ebc9facbba4efc8a2bdfd4d..8fed3060a90da960b77d592b0a26da8fd1c90745 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=177
+EXTRA_VERSION=178
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 53affb1cb56343a0deb78856d393959526bce7f8..710aa360a5569c6629b1a6cfa0ebd48ae1d81e30 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1127,7 +1127,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                }
        }
        if (!prefs_common.summary_quicksearch_sticky
-        && !prefs_common.summary_quicksearch_recurse
+        && (!prefs_common.summary_quicksearch_recurse
+        || !quicksearch_is_active(summaryview->quicksearch))
         && !quicksearch_is_running(summaryview->quicksearch)
         && !is_refresh) {
                quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");