flatpak, shell: Make desktop file honor "Devel" app_id

4 files changed, 22 insertions, 7 deletions

diff --git a/shell/appdata/meson.build b/shell/appdata/meson.build
index 526a10de8..3808325c8 100644
--- a/shell/appdata/meson.build
+++ b/shell/appdata/meson.build
@@ -1,8 +1,15 @@
+appdata_conf = configuration_data()
+appdata_conf.set('appid', application_id)
+
 appdata = 'org.gnome.Settings.appdata.xml'
 
 i18n.merge_file(
-  input: appdata + '.in',
-  output: appdata,
+  input: configure_file(
+    input: appdata + '.in',
+    output: 'org.gnome.Settings.appdata.xml.in',
+    configuration: appdata_conf
+  ),
+  output: '@0@.appdata.xml'.format(application_id),
   po_dir: po_dir,
   install: true,
   install_dir: join_paths(control_center_datadir, 'metainfo')
diff --git a/shell/meson.build b/shell/meson.build
index 3d894a7ac..8fe111a02 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -3,23 +3,31 @@ subdir('completions')
 
 service_conf = configuration_data()
 service_conf.set('bindir', control_center_bindir)
+service_conf.set('appid', application_id)
 
 service = 'org.gnome.Settings.service'
 
 configure_file(
           input : service + '.in',
-         output : service,
+         output : '@0@.service'.format(application_id),
         install : true,
     install_dir : join_paths(control_center_datadir, 'dbus-1', 'services'),
   configuration : service_conf
 )
 
+desktop_conf = configuration_data()
+desktop_conf.set('icon', application_id)
+
 desktop = 'org.gnome.Settings.desktop'
 
 i18n.merge_file(
          type : 'desktop',
-        input : desktop + '.in',
-       output : desktop,
+        input : configure_file(
+            input: desktop + '.in',
+            output: 'org.gnome.Settings.desktop.in',
+            configuration: desktop_conf
+        ),
+       output : '@0@.desktop'.format(application_id),
        po_dir : po_dir,
       install : true,
   install_dir : control_center_desktopdir
diff --git a/shell/org.gnome.Settings.desktop.in b/shell/org.gnome.Settings.desktop.in
index fb2530116..f323d6f7c 100644
--- a/shell/org.gnome.Settings.desktop.in
+++ b/shell/org.gnome.Settings.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Settings
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Settings
+Icon=@icon@
 Exec=gnome-control-center
 Terminal=false
 Type=Application
diff --git a/shell/org.gnome.Settings.service.in b/shell/org.gnome.Settings.service.in
index dbd6f82da..947f67e2a 100644
--- a/shell/org.gnome.Settings.service.in
+++ b/shell/org.gnome.Settings.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gnome.Settings
+Name=@appid@
 Exec=@bindir@/gnome-control-center