diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2018-06-06 02:02:12 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2018-07-26 02:49:37 +0200 |
| commit | aaf67ee7fdcd7c03fe67ec4c6959596923ac2cff (patch) | |
| tree | e2f8bd571eb3f7752e1e0e6ed1c310089521b31d | |
| parent | 9cb63ff9a659cb92ffc6cc93850b3702335610b2 (diff) | |
| download | nautilus-aaf67ee7fdcd7c03fe67ec4c6959596923ac2cff.tar.gz | |
search-engine-tracker: Use recursive if the query allows it
| -rw-r--r-- | src/nautilus-search-engine-tracker.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c index 2e701a9be..bd020a1e0 100644 --- a/src/nautilus-search-engine-tracker.c +++ b/src/nautilus-search-engine-tracker.c @@ -22,7 +22,6 @@ #include <config.h> #include "nautilus-search-engine-tracker.h" -#include "nautilus-global-preferences.h" #include "nautilus-search-hit.h" #include "nautilus-search-provider.h" #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH @@ -295,7 +294,6 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider) GString *sparql; GList *mimetypes, *l; gint mime_count; - gboolean recursive; GPtrArray *date_range; tracker = NAUTILUS_SEARCH_ENGINE_TRACKER (provider); @@ -317,10 +315,6 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider) return; } - recursive = g_settings_get_enum (nautilus_preferences, "recursive-search") == NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY || - g_settings_get_enum (nautilus_preferences, "recursive-search") == NAUTILUS_SPEED_TRADEOFF_ALWAYS; - tracker->recursive = recursive; - tracker->fts_enabled = nautilus_query_get_search_content (tracker->query); query_text = nautilus_query_get_text (tracker->query); @@ -470,12 +464,16 @@ nautilus_search_engine_tracker_set_query (NautilusSearchProvider *provider, NautilusQuery *query) { NautilusSearchEngineTracker *tracker; + NautilusQueryRecursive recursive; tracker = NAUTILUS_SEARCH_ENGINE_TRACKER (provider); + recursive = nautilus_query_get_recursive (query); - g_object_ref (query); g_clear_object (&tracker->query); - tracker->query = query; + + tracker->query = g_object_ref (query); + tracker->recursive = recursive == NAUTILUS_QUERY_RECURSIVE_ALWAYS || + recursive == NAUTILUS_QUERY_RECURSIVE_INDEXED_ONLY; } static gboolean |