2006-06-16 [colin] 2.3.0cvs19

	* src/summaryview.c
		Recursive quicksearch: show message list
		in current folder, *then* search children
		in the background.

diff --git a/ChangeLog b/ChangeLog
index af342d4783667edf9d6c564a01f01b2862cd478f..460dd0824a92356b160a2a3a79a3c4e238217eea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-16 [colin]     2.3.0cvs19
+
+       * src/summaryview.c
+               Recursive quicksearch: show message list
+               in current folder, *then* search children
+               in the background.
+
 2006-06-16 [colin]     2.3.0cvs18
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 4d777c1fed0db3ac8fbc6db93431ada61ac33b44..053e7ead83a28e498ed3b77bdc9379e7c5370a4a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1593,3 +1593,4 @@
 ( cvs diff -u -r 1.382.2.277 -r 1.382.2.278 src/compose.c;  cvs diff -u -r 1.207.2.103 -r 1.207.2.104 src/folderview.c;  cvs diff -u -r 1.28.2.17 -r 1.28.2.18 src/mbox.c;  cvs diff -u -r 1.94.2.87 -r 1.94.2.88 src/messageview.c;  cvs diff -u -r 1.10.2.8 -r 1.10.2.9 src/privacy.c;  cvs diff -u -r 1.10.2.7 -r 1.10.2.8 src/privacy.h;  cvs diff -u -r 1.49.2.77 -r 1.49.2.78 src/procmime.c;  cvs diff -u -r 1.150.2.68 -r 1.150.2.69 src/procmsg.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/pgpmime/pgpmime.c;  ) > 2.3.0cvs16.patchset
 ( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpinline/pgpinline.c;  ) > 2.3.0cvs17.patchset
 ( cvs diff -u -r 1.382.2.278 -r 1.382.2.279 src/compose.c;  cvs diff -u -r 1.115.2.90 -r 1.115.2.91 src/main.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_compose_writing.c;  cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/unmime.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/dist/html/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/dist/pdf/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/dist/ps/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/dist/txt/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/dist/html/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/dist/pdf/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/dist/ps/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/dist/txt/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/pl/dist/html/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/pl/dist/pdf/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/pl/dist/ps/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/pl/dist/txt/Makefile.am;  ) > 2.3.0cvs18.patchset
+( cvs diff -u -r 1.395.2.220 -r 1.395.2.221 src/summaryview.c;  ) > 2.3.0cvs19.patchset

diff --git a/configure.ac b/configure.ac
index 0447386c2e52efb32258d342f7537fd89ccaa15e..9562d9ad2c62c105f65358d95f298196fa43e2ef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index a35ff67c0cd541f254b8b5d2416bc7facb79a736..9134d0ab8938f73554630b759511eb5eba9afb88 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -828,6 +828,17 @@ static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
        summary_set_column_titles(summaryview);
 }
 
+static gboolean summaryview_quicksearch_recurse(gpointer data)
+{
+       SummaryView *summaryview = (SummaryView *)data;
+       main_window_cursor_wait(summaryview->mainwin);
+       quicksearch_reset_cur_folder_item(summaryview->quicksearch);
+       quicksearch_search_subfolders(summaryview->quicksearch, 
+                             summaryview->folderview,
+                             summaryview->folder_item);
+       main_window_cursor_normal(summaryview->mainwin);
+       return FALSE;
+}
 gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -1000,17 +1011,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                statusbar_pop_all();
                
                hidden_removed = TRUE;
-               if (quicksearch_is_running(summaryview->quicksearch)) {
-                       /* only scan subfolders when quicksearch changed,
-                        * not when search is the same and folder changed */
-                       main_window_cursor_wait(summaryview->mainwin);
-                       quicksearch_reset_cur_folder_item(summaryview->quicksearch);
-                       quicksearch_search_subfolders(summaryview->quicksearch, 
-                                             summaryview->folderview,
-                                             summaryview->folder_item);
-                       main_window_cursor_normal(summaryview->mainwin);
-               }
-
                if (!quicksearch_is_active(summaryview->quicksearch)) {
                        debug_print("search cancelled!\n");
                        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -1049,6 +1049,13 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        g_slist_free(mlist);
 
+       if (quicksearch_is_active(summaryview->quicksearch) &&
+           quicksearch_is_running(summaryview->quicksearch)) {
+               /* only scan subfolders when quicksearch changed,
+                * not when search is the same and folder changed */
+               g_timeout_add(100, summaryview_quicksearch_recurse, summaryview);
+       }
+
        if (is_refresh) {
                summaryview->displayed =
                        summary_find_msg_by_msgnum(summaryview,