diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2023-03-07 23:04:25 +0100 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2023-03-08 11:33:10 +0100 |
commit | ead121a3c19a3709f26ca0fcc6f053cb5b61cd5e (patch) | |
tree | 574a7acc7990a58a68fd3030b11ac6c468cd918f /gtk | |
parent | de4725dbd5301658537c279e7a4cb3026905b1f5 (diff) | |
download | gtk+-ead121a3c19a3709f26ca0fcc6f053cb5b61cd5e.tar.gz |
searchengine: Drop non-recursive search
Recursive search seems to be the hardcoded default, go with it.
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gtksearchenginetracker3.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/gtk/gtksearchenginetracker3.c b/gtk/gtksearchenginetracker3.c index f8dfd623ed..cb4dd2d6ce 100644 --- a/gtk/gtksearchenginetracker3.c +++ b/gtk/gtksearchenginetracker3.c @@ -55,7 +55,6 @@ #define SEARCH_QUERY SEARCH_QUERY_BASE("") #define SEARCH_RECURSIVE_QUERY SEARCH_QUERY_BASE("FILTER (STRSTARTS (?url, CONCAT (~location, '/')))") -#define SEARCH_LOCATION_QUERY SEARCH_QUERY_BASE("?urn nfo:belongsToContainer/nie:isStoredAs/nie:url ~location") struct _GtkSearchEngineTracker3 { @@ -63,7 +62,6 @@ struct _GtkSearchEngineTracker3 TrackerSparqlConnection *sparql_conn; TrackerSparqlStatement *search_query; TrackerSparqlStatement *search_recursive_query; - TrackerSparqlStatement *search_location_query; GCancellable *cancellable; guint idle_id; GtkQuery *query; @@ -108,7 +106,8 @@ finalize (GObject *object) g_clear_handle_id (&engine->idle_id, g_source_remove); g_clear_object (&engine->search_query); - g_clear_object (&engine->search_location_query); + g_clear_object (&engine->search_recursive_query); + if (engine->sparql_conn != NULL) { tracker_sparql_connection_close (engine->sparql_conn); @@ -258,7 +257,6 @@ gtk_search_engine_tracker3_start (GtkSearchEngine *engine) const char *search_text; char *match; GFile *location; - gboolean recursive; tracker = GTK_SEARCH_ENGINE_TRACKER3 (engine); @@ -277,22 +275,13 @@ gtk_search_engine_tracker3_start (GtkSearchEngine *engine) tracker->query_pending = TRUE; search_text = gtk_query_get_text (tracker->query); location = gtk_query_get_location (tracker->query); - recursive = TRUE; if (location) { char *location_uri = g_file_get_uri (location); - if (recursive) - { - g_debug ("Recursive search query in location: %s", location_uri); - statement = tracker->search_recursive_query; - } - else - { - g_debug ("Search query in location: %s", location_uri); - statement = tracker->search_location_query; - } + g_debug ("Recursive search query in location: %s", location_uri); + statement = tracker->search_recursive_query; tracker_sparql_statement_bind_string (statement, "location", @@ -398,14 +387,6 @@ gtk_search_engine_tracker3_initable_init (GInitable *initable, if (!engine->search_recursive_query) return FALSE; - engine->search_location_query = - tracker_sparql_connection_query_statement (engine->sparql_conn, - SEARCH_LOCATION_QUERY, - cancellable, - error); - if (!engine->search_location_query) - return FALSE; - return TRUE; } |