[gnome-software] snap: Don't use deprecated API

[Richard Hughes <rhughes src gnome org>]

commit e64602ceffd7ba0e6c0b6f824493ca66e849496e
Author: Andrea Azzarone <azzaronea gmail com>
Date:   Mon Jul 16 23:09:21 2018 +0200

    snap: Don't use deprecated API
    
    Replace the use of snapd_client_list_sync with snapd_client_get_snaps_sync,
    snapd_client_list_one_sync with snapd_client_get_snap_sync, and
    gs_app_set_developer_name with snapd_snap_get_publisher_username.

 plugins/snap/gs-plugin-snap.c | 9 +++------
 plugins/snap/gs-self-test.c   | 7 ++++---
 2 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/plugins/snap/gs-plugin-snap.c b/plugins/snap/gs-plugin-snap.c
index 6323f6ca..b508310e 100644
--- a/plugins/snap/gs-plugin-snap.c
+++ b/plugins/snap/gs-plugin-snap.c
@@ -547,7 +547,7 @@ gs_plugin_add_installed (GsPlugin *plugin,
        if (client == NULL)
                return FALSE;
 
-       snaps = snapd_client_list_sync (client, cancellable, error);
+       snaps = snapd_client_get_snaps_sync (client, SNAPD_GET_SNAPS_FLAGS_NONE, NULL, cancellable, error);
        if (snaps == NULL) {
                snapd_error_convert (error);
                return FALSE;
@@ -557,9 +557,6 @@ gs_plugin_add_installed (GsPlugin *plugin,
                SnapdSnap *snap = g_ptr_array_index (snaps, i);
                g_autoptr(GsApp) app = NULL;
 
-               if (snapd_snap_get_status (snap) != SNAPD_SNAP_STATUS_ACTIVE)
-                       continue;
-
                app = snap_to_app (plugin, snap);
                gs_app_list_add (list, app);
        }
@@ -793,7 +790,7 @@ gs_plugin_refine_app (GsPlugin *plugin,
                return FALSE;
 
        /* get information from local snaps and store */
-       local_snap = snapd_client_list_one_sync (client, gs_app_get_metadata_item (app, "snap::name"), 
cancellable, NULL);
+       local_snap = snapd_client_get_snap_sync (client, gs_app_get_metadata_item (app, "snap::name"), 
cancellable, NULL);
        if (local_snap == NULL || (flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_SCREENSHOTS) != 0)
                store_snap = get_store_snap (plugin, gs_app_get_metadata_item (app, "snap::name"), 
cancellable, NULL);
        if (local_snap == NULL && store_snap == NULL)
@@ -815,7 +812,7 @@ gs_plugin_refine_app (GsPlugin *plugin,
        if (description != NULL)
                gs_app_set_description (app, GS_APP_QUALITY_NORMAL, description);
        gs_app_set_license (app, GS_APP_QUALITY_NORMAL, snapd_snap_get_license (snap));
-       gs_app_set_developer_name (app, snapd_snap_get_developer (snap));
+       gs_app_set_developer_name (app, snapd_snap_get_publisher_username (snap));
 
        snap = local_snap != NULL ? local_snap : store_snap;
        gs_app_set_version (app, snapd_snap_get_version (snap));
diff --git a/plugins/snap/gs-self-test.c b/plugins/snap/gs-self-test.c
index 809448bf..80df686b 100644
--- a/plugins/snap/gs-self-test.c
+++ b/plugins/snap/gs-self-test.c
@@ -124,8 +124,9 @@ make_snap (const gchar *name, SnapdSnapStatus status)
 }
 
 GPtrArray *
-snapd_client_list_sync (SnapdClient *client,
-                       GCancellable *cancellable, GError **error)
+snapd_client_get_snaps_sync (SnapdClient *client,
+                            SnapdGetSnapsFlags flags, gchar **names,
+                            GCancellable *cancellable, GError **error)
 {
        GPtrArray *snaps;
 
@@ -137,7 +138,7 @@ snapd_client_list_sync (SnapdClient *client,
 }
 
 SnapdSnap *
-snapd_client_list_one_sync (SnapdClient *client,
+snapd_client_get_snap_sync (SnapdClient *client,
                            const gchar *name,
                            GCancellable *cancellable, GError **error)
 {