[gnome-software/wip/temp/ubuntu-xenial-rebased: 272/329] Put snaps back in the same list as installed apps
- From: Iain Lane <iainl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/temp/ubuntu-xenial-rebased: 272/329] Put snaps back in the same list as installed apps
- Date: Fri, 29 Apr 2016 14:08:13 +0000 (UTC)
commit 323badd4b5bb862d1f6c5fae1b253276b643a2ed
Author: William Hua <william hua canonical com>
Date: Mon Apr 18 09:00:01 2016 -0400
Put snaps back in the same list as installed apps
src/gs-plugin-loader.c | 3 +--
src/gs-shell-details.c | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/gs-plugin-loader.c b/src/gs-plugin-loader.c
index 287505d..d8caca6 100644
--- a/src/gs-plugin-loader.c
+++ b/src/gs-plugin-loader.c
@@ -432,8 +432,7 @@ 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) &&
- (g_strcmp0 (gs_app_get_management_plugin (app), "snappy") != 0)) {
+ (gs_app_get_kind (app) == AS_APP_KIND_GENERIC)) {
// 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/gs-shell-details.c b/src/gs-shell-details.c
index cb0cb05..359ef82 100644
--- a/src/gs-shell-details.c
+++ b/src/gs-shell-details.c
@@ -258,8 +258,9 @@ gs_shell_details_switch_to (GsPage *page, gboolean scroll_up)
case AS_APP_STATE_INSTALLED:
case AS_APP_STATE_UPDATABLE:
case AS_APP_STATE_UPDATABLE_LIVE:
- if (gs_app_get_kind (self->app) == AS_APP_KIND_DESKTOP ||
- gs_app_get_kind (self->app) == AS_APP_KIND_WEB_APP) {
+ if ((gs_app_get_kind (self->app) == AS_APP_KIND_DESKTOP ||
+ gs_app_get_kind (self->app) == AS_APP_KIND_WEB_APP) &&
+ g_strcmp0 (gs_app_get_management_plugin (self->app), "snappy") != 0) {
gtk_widget_set_visible (self->button_details_launch, TRUE);
} else {
gtk_widget_set_visible (self->button_details_launch, FALSE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]