From 5ca4bfa63d5c3511db82ca589511c62aa5119592 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 26 Sep 2012 12:04:51 +0000 Subject: [PATCH] 2012-09-26 [colin] 3.8.1cvs77 * src/summary_search.c Fix unresponsive stop button * src/gtk/quicksearch.c Fix busy cursor --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/quicksearch.c | 2 +- src/summary_search.c | 13 +++++++++++-- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 628537092..3cd61d5fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-09-26 [colin] 3.8.1cvs77 + + * src/summary_search.c + Fix unresponsive stop button + * src/gtk/quicksearch.c + Fix busy cursor + 2012-09-26 [colin] 3.8.1cvs76 * src/summary_search.c diff --git a/PATCHSETS b/PATCHSETS index cc8c3f2fa..e3ce481d1 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4451,3 +4451,4 @@ ( cvs diff -u -r 1.213.2.213 -r 1.213.2.214 src/folder.c; cvs diff -u -r 1.87.2.68 -r 1.87.2.69 src/folder.h; cvs diff -u -r 1.179.2.263 -r 1.179.2.264 src/imap.c; cvs diff -u -r 1.150.2.129 -r 1.150.2.130 src/procmsg.c; cvs diff -u -r 1.60.2.64 -r 1.60.2.65 src/procmsg.h; cvs diff -u -r 1.395.2.454 -r 1.395.2.455 src/summaryview.c; ) > 3.8.1cvs74.patchset ( cvs diff -u -r 1.213.2.214 -r 1.213.2.215 src/folder.c; ) > 3.8.1cvs75.patchset ( cvs diff -u -r 1.15.2.71 -r 1.15.2.72 src/summary_search.c; cvs diff -u -r 1.395.2.455 -r 1.395.2.456 src/summaryview.c; cvs diff -u -r 1.68.2.62 -r 1.68.2.63 src/summaryview.h; cvs diff -u -r 1.1.2.114 -r 1.1.2.115 src/gtk/quicksearch.c; ) > 3.8.1cvs76.patchset +( cvs diff -u -r 1.15.2.72 -r 1.15.2.73 src/summary_search.c; cvs diff -u -r 1.1.2.115 -r 1.1.2.116 src/gtk/quicksearch.c; ) > 3.8.1cvs77.patchset diff --git a/configure.ac b/configure.ac index 2451dd212..94b8a2123 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=76 +EXTRA_VERSION=77 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c index 045753764..7dd03c520 100644 --- a/src/gtk/quicksearch.c +++ b/src/gtk/quicksearch.c @@ -169,7 +169,7 @@ gboolean quicksearch_run_on_folder(QuickSearch* quicksearch, FolderItem *folderI gboolean searchres; main_window_cursor_wait(mainwindow_get_mainwindow()); searchres = advsearch_search_msgs_in_folders(quicksearch->asearch, result, folderItem, FALSE); - main_window_cursor_wait(mainwindow_get_mainwindow()); + main_window_cursor_normal(mainwindow_get_mainwindow()); if (quicksearch->want_reexec) { advsearch_set(quicksearch->asearch, quicksearch->request.type, ""); } diff --git a/src/summary_search.c b/src/summary_search.c index 8dff167ad..f58a3c49a 100644 --- a/src/summary_search.c +++ b/src/summary_search.c @@ -535,6 +535,16 @@ static gboolean summary_search_verify_match(MsgInfo *msg) return FALSE; } +static gboolean summary_search_progress_cb(gpointer data, guint at, guint matched, guint total) +{ + if (!search_window.is_searching) { + search_window.matcher_is_outdated = TRUE; + return FALSE; + } + + return summaryview_search_root_progress(search_window.summaryview, at, matched, total); +} + static gboolean summary_search_prepare_matcher() { gboolean adv_search; @@ -553,8 +563,7 @@ static gboolean summary_search_prepare_matcher() search_window.advsearch = advsearch_new(); advsearch_set_on_error_cb(search_window.advsearch, NULL, NULL); /* TODO */ advsearch_set_on_progress_cb(search_window.advsearch, - summaryview_search_root_progress, - search_window.summaryview); + summary_search_progress_cb, NULL); } adv_search = gtk_toggle_button_get_active -- 2.25.1