[gnome-software: 1/2] snap: Fix snap alternatives missing safety information

[Philip Withnall <pwithnall src gnome org>]

commit d0747ba25e0381b4f0ceb0cd67e1bd4adb94f774
Author: Robert Ancell <robert ancell gmail com>
Date:   Thu Sep 23 09:20:21 2021 +0000

    snap: Fix snap alternatives missing safety information

 plugins/snap/gs-plugin-snap.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/plugins/snap/gs-plugin-snap.c b/plugins/snap/gs-plugin-snap.c
index 2e21e6ba4..22329c654 100644
--- a/plugins/snap/gs-plugin-snap.c
+++ b/plugins/snap/gs-plugin-snap.c
@@ -646,7 +646,7 @@ expand_channel_name (const gchar *name)
 }
 
 static void
-add_channels (SnapdSnap *snap, GsAppList *list)
+add_channels (GsPlugin *plugin, SnapdSnap *snap, GsAppList *list)
 {
        GStrv tracks;
        GPtrArray *channels;
@@ -663,17 +663,14 @@ add_channels (SnapdSnap *snap, GsAppList *list)
 
        for (guint i = 0; i < sorted_channels->len; i++) {
                SnapdChannel *channel = g_ptr_array_index (sorted_channels, i);
-               g_autofree gchar *appstream_id = NULL;
-               g_autoptr(GsApp) a;
+               g_autoptr(GsApp) app = NULL;
                g_autofree gchar *expanded_name = NULL;
 
-               appstream_id = get_appstream_id (snap);
-               a = gs_app_new (appstream_id);
-               gs_app_set_bundle_kind (a, AS_BUNDLE_KIND_SNAP);
-               gs_app_set_metadata (a, "snap::name", snapd_snap_get_name (snap));
+               app = snap_to_app (plugin, snap);
                expanded_name = expand_channel_name (snapd_channel_get_name (channel));
-               gs_app_set_branch (a, expanded_name);
-               gs_app_list_add (list, a);
+               gs_app_set_branch (app, expanded_name);
+
+               gs_app_list_add (list, app);
        }
 }
 
@@ -697,7 +694,7 @@ gs_plugin_add_alternates (GsPlugin *plugin,
                        return TRUE;
                }
 
-               add_channels (snap, list);
+               add_channels (plugin, snap, list);
        } else {
                g_autoptr(GPtrArray) snaps = NULL;
                guint i;
@@ -708,7 +705,7 @@ gs_plugin_add_alternates (GsPlugin *plugin,
                        SnapdSnap *store_snap;
 
                        store_snap = get_store_snap (plugin, snapd_snap_get_name (snap), TRUE, cancellable, 
NULL);
-                       add_channels (store_snap, list);
+                       add_channels (plugin, store_snap, list);
                }
                return TRUE;
        }