[nautilus] simple-engine: always emit finished, even when cancelled
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] simple-engine: always emit finished, even when cancelled
- Date: Mon, 15 Oct 2012 14:03:43 +0000 (UTC)
commit 5a6f9bd61d18157fa2f56b58115f024708967325
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sat Oct 13 17:20:58 2012 -0400
simple-engine: always emit finished, even when cancelled
Otherwise the search hits hash table won't be cleared when search is
stopped, leading to missing results.
.../nautilus-search-engine-simple.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c
index 0a52dac..bdcaf3d 100644
--- a/libnautilus-private/nautilus-search-engine-simple.c
+++ b/libnautilus-private/nautilus-search-engine-simple.c
@@ -142,14 +142,10 @@ search_thread_data_free (SearchThreadData *data)
static gboolean
search_thread_done_idle (gpointer user_data)
{
- SearchThreadData *data;
-
- data = user_data;
+ SearchThreadData *data = user_data;
- if (!g_cancellable_is_cancelled (data->cancellable)) {
- nautilus_search_provider_finished (NAUTILUS_SEARCH_PROVIDER (data->engine));
- data->engine->details->active_search = NULL;
- }
+ nautilus_search_provider_finished (NAUTILUS_SEARCH_PROVIDER (data->engine));
+ data->engine->details->active_search = NULL;
search_thread_data_free (data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]