[gnome-control-center/wip/jimmac/nightly-app-icon] shell: Use a meson option to determine that we're in a sandbox



commit a4fb3bd5fdb44090a288e06af82aa655703d5055
Author: Felipe Borges <felipeborges gnome org>
Date:   Tue Oct 8 18:36:37 2019 +0200

    shell: Use a meson option to determine that we're in a sandbox

 meson.build       | 1 +
 shell/cc-window.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 77f3ec3cd..2ffa24b74 100644
--- a/meson.build
+++ b/meson.build
@@ -41,6 +41,7 @@ set_defines = [
   ['PACKAGE', meson.project_name()],
   ['PACKAGE_VERSION', meson.project_version()],
   ['VERSION', meson.project_version()],
+  ['PROFILE', get_option('profile')],
   # i18n
   ['GETTEXT_PACKAGE', control_center_gettext]
 ]
diff --git a/shell/cc-window.c b/shell/cc-window.c
index 8f2a9c8b8..19e302c06 100644
--- a/shell/cc-window.c
+++ b/shell/cc-window.c
@@ -102,7 +102,7 @@ enum
 static gboolean
 in_flatpak_sandbox (void)
 {
-  return g_file_test ("/.flatpak-info", G_FILE_TEST_EXISTS);
+  return g_strcmp0 (PROFILE, "development") == 0;
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]