Flatpak: Add stable handling

4 files changed, 20 insertions, 17 deletions

diff --git a/build-aux/flatpak/org.gnome.NautilusDevel.json b/build-aux/flatpak/org.gnome.NautilusDevel.json
index 921a51d28..083bcdcad 100644
--- a/build-aux/flatpak/org.gnome.NautilusDevel.json
+++ b/build-aux/flatpak/org.gnome.NautilusDevel.json
@@ -1,11 +1,11 @@
 {
-    "app-id": "org.gnome.NautilusDevel",
+    "app-id": "org.gnome.NautilusStableFlatpak",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
+    "runtime-version": "3.28",
     "sdk": "org.gnome.Sdk",
     "command": "nautilus",
-    "tags": ["devel", "development", "nightly"],
-    "desktop-file-name-prefix": "(Development) ",
+    "tags": ["test", "stable"],
+    "desktop-file-name-prefix": "(3.28 Flatpak) ",
     "finish-args": [
         "--share=ipc", "--socket=x11",
         "--socket=wayland",
@@ -15,7 +15,6 @@
         "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
         "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
-    "cleanup": [ "/include", "/share/bash-completion" ],
     "modules": [
         {
             "name": "exiv2",
@@ -84,7 +83,7 @@
             "name": "nautilus",
             "config-opts": [
                 "--libdir=/app/lib",
-                "-Dprofile=development"
+                "-Dprofile=stable-flatpak"
             ],
             "sources": [
                 {
diff --git a/meson.build b/meson.build
index 00408d894..e37583f8a 100644
--- a/meson.build
+++ b/meson.build
@@ -94,17 +94,16 @@ conf = configuration_data()
 
 if get_option('profile') == 'development'
   version = '@0@-@VCS_TAG@'.format(meson.project_version())
-  conf.set_quoted('NAME_SUFFIX', ' (Development Snapshot)')
   profile = 'Devel'
+  name_suffix = ' (Development Snapshot)'
+elif get_option('profile') == 'stable-flatpak'
+  version = '@0@-flatpak'.format(meson.project_version())
+  profile = 'StableFlatpak'
+  name_suffix = ' (3.28 Flatpak)'
 else
-  if get_option('profile') == 'stable-flatpak'
-    version = '@0@-flatpak'.format(meson.project_version())
-    profile = 'Stable'
-  else
-    version = meson.project_version()
-    profile = ''
-  endif
-  conf.set_quoted('NAME_SUFFIX', '')
+  version = meson.project_version()
+  profile = ''
+  name_suffix = ''
 endif
 
 application_id = 'org.gnome.Nautilus@0@'.format(profile)
@@ -117,6 +116,7 @@ conf.set_quoted('NAUTILUS_DATADIR', join_paths(datadir, 'nautilus'))
 conf.set_quoted('NAUTILUS_EXTENSIONDIR', join_paths(prefix, extensiondir))
 conf.set_quoted('APPLICATION_ID', application_id)
 conf.set_quoted('PROFILE', profile)
+conf.set_quoted('NAME_SUFFIX', name_suffix)
 
 if get_option('packagekit')
   conf.set10('ENABLE_PACKAGEKIT', true)
@@ -128,7 +128,7 @@ if get_option('selinux')
   conf.set10('HAVE_SELINUX', true)
 endif
 
-if get_option('profile') == 'development'
+if true or get_option('profile') == 'development'
   config_h = declare_dependency(
     sources: vcs_tag(
       command: ['git', 'rev-parse', '--short', 'HEAD'],
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 202ba1322..3c657ad56 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -272,7 +272,8 @@ nautilus_application_create_window (NautilusApplication *self,
                                  MAX (NAUTILUS_WINDOW_MIN_HEIGHT, default_height));
 
     application_id = g_application_get_application_id (G_APPLICATION (self));
-    if (g_strcmp0 (application_id, "org.gnome.NautilusDevel") == 0)
+    if (g_strcmp0 (application_id, "org.gnome.NautilusDevel") == 0 ||
+        g_strcmp0 (application_id, "org.gnome.NautilusStableFlatpak") == 0)
     {
         GtkStyleContext *style_context;
 
diff --git a/src/resources/css/Adwaita.css b/src/resources/css/Adwaita.css
index 59ab22b02..b45361a78 100644
--- a/src/resources/css/Adwaita.css
+++ b/src/resources/css/Adwaita.css
@@ -4,6 +4,7 @@
     background: @theme_base_color;
 }
 
+/* Devel window styling */
 .nautilus-window.devel headerbar {
     background: #cbd2d9 -gtk-icontheme("system-run-symbolic") 70% 0/64px 64px no-repeat, linear-gradient(to top, #a5b1bd, #c5cdd5 2px, #cbd2d9 3px);
     box-shadow: inset 0 1px #f1f3f5;
@@ -119,6 +120,8 @@
     -gtk-icon-shadow: none;
 }
 
+/* End devel window styling */
+
 .nautilus-canvas-item {
     border-radius: 5px;
 }