[nautilus/gnome-3-6] search-engine-simple: don't send last batch when cancelled



commit 93edf4e3632d57e4ea183d3ecbb1138fed14992c
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun Oct 14 13:37:59 2012 -0400

    search-engine-simple: don't send last batch when cancelled
    
    There's no need to send a last batch of results if we are returning
    because of a cancellation.

 .../nautilus-search-engine-simple.c                |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c
index 453ff12..dc6ed8a 100644
--- a/libnautilus-private/nautilus-search-engine-simple.c
+++ b/libnautilus-private/nautilus-search-engine-simple.c
@@ -318,7 +318,10 @@ search_thread_func (gpointer user_data)
 		visit_directory (dir, data);
 		g_object_unref (dir);
 	}
-	send_batch (data);
+
+	if (!g_cancellable_is_cancelled (data->cancellable)) {
+		send_batch (data);
+	}
 
 	g_idle_add (search_thread_done_idle, data);
 	



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]