[gnome-software: 13/20] gs-shell-search-provider: Port ACTION_SEARCH to use GsPluginJobListApps

[Milan Crha <mcrha src gnome org>]

commit dd5e765e2f79d9bac2b38f29ea218881e003e880
Author: Philip Withnall <pwithnall endlessos org>
Date:   Fri Jul 1 18:08:48 2022 +0100

    gs-shell-search-provider: Port ACTION_SEARCH to use GsPluginJobListApps
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>
    
    Helps: #1472

 src/gs-shell-search-provider.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/gs-shell-search-provider.c b/src/gs-shell-search-provider.c
index e83bba0f1..5003a5b9b 100644
--- a/src/gs-shell-search-provider.c
+++ b/src/gs-shell-search-provider.c
@@ -148,10 +148,8 @@ execute_search (GsShellSearchProvider  *self,
                gchar            **terms)
 {
        PendingSearch *pending_search;
-       g_autofree gchar *value = NULL;
        g_autoptr(GsPluginJob) plugin_job = NULL;
-
-       value = g_strjoinv (" ", terms);
+       g_autoptr(GsAppQuery) query = NULL;
 
        g_cancellable_cancel (self->cancellable);
        g_clear_object (&self->cancellable);
@@ -170,15 +168,17 @@ execute_search (GsShellSearchProvider  *self,
        g_application_hold (g_application_get_default ());
        self->cancellable = g_cancellable_new ();
 
-       plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_SEARCH,
-                                        "search", value,
-                                        "refine-flags", GS_PLUGIN_REFINE_FLAGS_REQUIRE_ICON |
-                                                        GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN_HOSTNAME,
-                                        "max-results", GS_SHELL_SEARCH_PROVIDER_MAX_RESULTS,
-                                        "dedupe-flags", GS_APP_LIST_FILTER_FLAG_PREFER_INSTALLED |
-                                                        GS_APP_LIST_FILTER_FLAG_KEY_ID_PROVIDES,
-                                        NULL);
-       gs_plugin_job_set_sort_func (plugin_job, gs_shell_search_provider_sort_cb, self);
+       query = gs_app_query_new ("keywords", terms,
+                                 "refine-flags", GS_PLUGIN_REFINE_FLAGS_REQUIRE_ICON |
+                                                 GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN_HOSTNAME,
+                                 "dedupe-flags", GS_APP_LIST_FILTER_FLAG_PREFER_INSTALLED |
+                                                 GS_APP_LIST_FILTER_FLAG_KEY_ID_PROVIDES,
+                                 "max-results", GS_SHELL_SEARCH_PROVIDER_MAX_RESULTS,
+                                 "sort-func", gs_shell_search_provider_sort_cb,
+                                 "sort-user-data", self,
+                                 NULL);
+       plugin_job = gs_plugin_job_list_apps_new (query, GS_PLUGIN_LIST_APPS_FLAGS_NONE);
+
        gs_plugin_loader_job_process_async (self->plugin_loader, plugin_job,
                                            self->cancellable,
                                            search_done_cb,