From d2961830106abe6c6576207f90e2d968b554a115 Mon Sep 17 00:00:00 2001 From: Carlos Soriano Date: Mon, 29 Aug 2016 10:52:45 +0200 Subject: [PATCH] shell-search-provider: remove simple engine recursivity In 26a3ab4cd5 we put recursivity to the simple search engine in order to fix the report of some users that weren't getting files inside folder of home directory. However this is wrong, since it takes too long and gnome-shell search provider doesn't have a way to get partial results or close the search when done, which makes Nautilus not reporting results until the search is done, and in case the user stops the shell search, nautilus keeps searching making the CPU consumption really high. In fact, we always made recursivity for tracker but not for the simple engine when performing the shell search. The issue users were experiencing seems unrelated to this, and I actually cannot reproduce, so let's return to the regular behaviour we had. https://bugzilla.gnome.org/show_bug.cgi?id=766174 --- src/nautilus-shell-search-provider.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c index df5924564..41ee0d9ac 100644 --- a/src/nautilus-shell-search-provider.c +++ b/src/nautilus-shell-search-provider.c @@ -394,7 +394,6 @@ execute_search (NautilusShellSearchProvider *self, { gchar *terms_joined; NautilusQuery *query; - NautilusSearchEngineSimple *simple_provider; PendingSearch *pending_search; GFile *home; @@ -439,8 +438,6 @@ execute_search (NautilusShellSearchProvider *self, g_debug ("*** Search engine search started"); nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (pending_search->engine), query); - simple_provider = nautilus_search_engine_get_simple_provider (pending_search->engine); - g_object_set (simple_provider, "recursive", TRUE, NULL); nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (pending_search->engine)); g_clear_object (&home);