2007-11-14 [colin] 3.0.2cvs136

	* src/summaryview.c
	* src/gtk/quicksearch.c
	* src/gtk/quicksearch.h
		Fix resetting the quicksearch when in non-sticky
		mode, but Recursive is set: reset only when going
		out of the root search folder.

diff --git a/ChangeLog b/ChangeLog
index a01dde23a6ea68290102c8b99766fc8254f35207..2d5feb272d9ccdf0f0d8b05ba4518b3db1ce32dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-14 [colin]     3.0.2cvs136
+
+       * src/summaryview.c
+       * src/gtk/quicksearch.c
+       * src/gtk/quicksearch.h
+               Fix resetting the quicksearch when in non-sticky
+               mode, but Recursive is set: reset only when going
+               out of the root search folder.
+
 2007-11-14 [colin]     3.0.2cvs135
 
        * src/filtering.c

diff --git a/PATCHSETS b/PATCHSETS
index ac1267f31ec9ecf8495463b2cba597c033303564..bc571dab0b72e0baca3f9cee81415a212b70d088 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3048,3 +3048,4 @@
 ( cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/imap_gtk.c;  cvs diff -u -r 1.2.2.28 -r 1.2.2.29 src/mh_gtk.c;  ) > 3.0.2cvs133.patchset
 ( cvs diff -u -r 1.12.2.24 -r 1.12.2.25 src/plugins/dillo_viewer/dillo_viewer.c;  ) > 3.0.2cvs134.patchset
 ( cvs diff -u -r 1.60.2.40 -r 1.60.2.41 src/filtering.c;  ) > 3.0.2cvs135.patchset
+( cvs diff -u -r 1.395.2.334 -r 1.395.2.335 src/summaryview.c;  cvs diff -u -r 1.1.2.81 -r 1.1.2.82 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/quicksearch.h;  ) > 3.0.2cvs136.patchset

diff --git a/configure.ac b/configure.ac
index 28aaa7fcde4c78bc6d5776a956d3393abb2c8929..4bd50989930f9443e2593e5dec1fa0cf0e60be61 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=135
+EXTRA_VERSION=136
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 880a565c7808eab174e0d86dd8277ab262bbedfb..6994800439c8da92c871a022e3707f139d4b36d7 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -1282,6 +1282,20 @@ static gboolean quicksearch_match_subfolder(QuickSearch *quicksearch,
        return result;
 }
 
+gboolean quicksearch_is_in_subfolder(QuickSearch *quicksearch, FolderItem *cur)
+{
+       if (quicksearch->root_folder_item == NULL)
+               return FALSE;
+       
+       while (cur) {
+               if (cur == quicksearch->root_folder_item) {
+                       return TRUE;
+               }
+               cur = folder_item_parent(cur);
+       }
+       return FALSE;
+}
+
 void quicksearch_search_subfolders(QuickSearch *quicksearch,
                                   FolderView *folderview,
                                   FolderItem *folder_item)

diff --git a/src/gtk/quicksearch.h b/src/gtk/quicksearch.h
index 7914fb2b8c1c5a6b08c31a96d887f549986202e6..e5d6ea3e2ac53a539598122422186dc0583bde48 100644 (file)
--- a/src/gtk/quicksearch.h
+++ b/src/gtk/quicksearch.h
@@ -53,6 +53,7 @@ void quicksearch_reset_cur_folder_item(QuickSearch *quicksearch);
 void quicksearch_search_subfolders(QuickSearch *quicksearch, 
                                   FolderView  *folderview,
                                   FolderItem  *folder_item);
+gboolean quicksearch_is_in_subfolder(QuickSearch *quicksearch, FolderItem *cur);
 gboolean quicksearch_is_fast(QuickSearch *quicksearch);
 gboolean quicksearch_is_in_typing(QuickSearch *quicksearch);
 void quicksearch_relayout(QuickSearch *quicksearch);

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