[gnome-software/wip/hughsie/no-claim-wildcard: 3/5] Never claim wildcard applications from AppStream

[Richard Hughes <rhughes src gnome org>]

commit e1fcb1cf05b516d95e67c230b9a5930eedf2e884
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 15 21:29:40 2019 +0100

    Never claim wildcard applications from AppStream
    
    Fixes half of https://gitlab.gnome.org/GNOME/gnome-software/issues/736

 plugins/flatpak/gs-flatpak.c                          | 17 +++--------------
 plugins/shell-extensions/gs-plugin-shell-extensions.c |  9 ++-------
 2 files changed, 5 insertions(+), 21 deletions(-)
---
diff --git a/plugins/flatpak/gs-flatpak.c b/plugins/flatpak/gs-flatpak.c
index fe89d2b9..673fcb45 100644
--- a/plugins/flatpak/gs-flatpak.c
+++ b/plugins/flatpak/gs-flatpak.c
@@ -2766,22 +2766,11 @@ gs_flatpak_add_category_apps (GsFlatpak *self,
                              GCancellable *cancellable,
                              GError **error)
 {
-       g_autoptr(GsAppList) list_tmp = gs_app_list_new ();
        g_autoptr(GRWLockReaderLocker) locker = NULL;
-
-       if (!gs_flatpak_rescan_appstream_store (self, cancellable, error))
-               return FALSE;
-
        locker = g_rw_lock_reader_locker_new (&self->silo_lock);
-       if (!gs_appstream_add_category_apps (self->plugin, self->silo,
-                                            category, list_tmp,
-                                            cancellable, error))
-               return FALSE;
-
-       gs_flatpak_claim_app_list (self, list_tmp);
-       gs_app_list_add_list (list, list_tmp);
-
-       return TRUE;
+       return gs_appstream_add_category_apps (self->plugin, self->silo,
+                                              category, list,
+                                              cancellable, error);
 }
 
 gboolean
diff --git a/plugins/shell-extensions/gs-plugin-shell-extensions.c 
b/plugins/shell-extensions/gs-plugin-shell-extensions.c
index c5861bf9..979f680b 100644
--- a/plugins/shell-extensions/gs-plugin-shell-extensions.c
+++ b/plugins/shell-extensions/gs-plugin-shell-extensions.c
@@ -927,18 +927,13 @@ gs_plugin_add_category_apps (GsPlugin *plugin, GsCategory *category, GsAppList *
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
        g_autoptr(GRWLockReaderLocker) locker = NULL;
-       g_autoptr(GsAppList) list_tmp = gs_app_list_new ();
        if (!g_settings_get_boolean (priv->settings, "enable-shell-extensions-repo"))
                return TRUE;
        if (!_check_silo (plugin, cancellable, error))
                return FALSE;
        locker = g_rw_lock_reader_locker_new (&priv->silo_lock);
-       if (!gs_appstream_add_category_apps (plugin, priv->silo, category,
-                                            list_tmp, cancellable, error))
-               return FALSE;
-       _claim_components (plugin, list_tmp);
-       gs_app_list_add_list (list, list_tmp);
-       return TRUE;
+       return gs_appstream_add_category_apps (plugin, priv->silo, category,
+                                              list, cancellable, error);
 }
 
 gboolean