( 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
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);
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));
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,