[gnome-software/wip/attente/ubuntu-xenial] Disable the Launch button for snappy apps

[William Hua <williamhua src gnome org>]

commit 73bdff5f409870235b8f495defcb1aa33ca26a30
Author: William Hua <william hua canonical com>
Date:   Sun Apr 17 22:09:00 2016 -0400

    Disable the Launch button for snappy apps

 src/gs-plugin-loader.c         |    3 ++-
 src/plugins/gs-plugin-snappy.c |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/gs-plugin-loader.c b/src/gs-plugin-loader.c
index 292fba8..ce6af76 100644
--- a/src/gs-plugin-loader.c
+++ b/src/gs-plugin-loader.c
@@ -469,7 +469,8 @@ gs_plugin_loader_app_is_valid (GsApp *app, gpointer user_data)
 
        /* don't show unconverted packages in the application view */
        if (((state->flags & GS_PLUGIN_REFINE_FLAGS_ALLOW_PACKAGES) == 0) &&
-           (gs_app_get_kind (app) == AS_APP_KIND_GENERIC)) {
+           (gs_app_get_kind (app) == AS_APP_KIND_GENERIC) &&
+           (g_strcmp0 (gs_app_get_management_plugin (app), "snappy") != 0)) {
 //             g_debug ("app invalid as only a %s: %s",
 //                      as_app_kind_to_string (gs_app_get_kind (app)),
 //                      gs_plugin_loader_get_app_str (app));
diff --git a/src/plugins/gs-plugin-snappy.c b/src/plugins/gs-plugin-snappy.c
index 5bce7a2..ec50fdf 100644
--- a/src/plugins/gs-plugin-snappy.c
+++ b/src/plugins/gs-plugin-snappy.c
@@ -222,7 +222,7 @@ get_apps (GsPlugin *plugin, const gchar *sources, gchar **search_terms, GList **
                app = gs_app_new (id);
                gs_app_set_management_plugin (app, "snappy");
                gs_app_set_origin (app, _("Ubuntu Snappy Store"));
-               gs_app_set_kind (app, AS_APP_KIND_DESKTOP);
+               gs_app_set_kind (app, AS_APP_KIND_GENERIC);
                refine_app (plugin, app, package);
                gs_plugin_add_app (list, app);
        }