[connections/match-appdata-to-appid: 4/4] appdata, build: Match appdata with app-id

[Felipe Borges <felipeborges src gnome org>]

commit ae91b6735255deb5da6f98e22593c122939c472a
Author: Felipe Borges <felipeborges gnome org>
Date:   Tue May 17 18:01:19 2022 +0200

    appdata, build: Match appdata with app-id
    
    This is relevant for Flatpak builds with the "development" profile
    where the appdata info wasn't macthing the application-id, which
    in this case, is suffixed with the ".Devel" branch name.

 data/meson.build                          | 8 +++++++-
 data/org.gnome.Connections.appdata.xml.in | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 57f4e44..0bf1d55 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -20,8 +20,14 @@ if desktop_utils.found()
   )
 endif
 
+appstream_conf = configuration_data()
+appstream_conf.set('app-id', application_id)
 appstream_file = i18n.merge_file(
-  input: 'org.gnome.Connections.appdata.xml.in',
+  input: configure_file(
+    input: 'org.gnome.Connections.appdata.xml.in',
+    output: 'org.gnome.Connections.appdata.xml.in',
+    configuration: appstream_conf
+  ),
   output: '@0  appdata xml'.format(application_id),
   po_dir: '../po',
   install: true,
diff --git a/data/org.gnome.Connections.appdata.xml.in b/data/org.gnome.Connections.appdata.xml.in
index 095db89..bdde84b 100644
--- a/data/org.gnome.Connections.appdata.xml.in
+++ b/data/org.gnome.Connections.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2020 Red Hat, Inc -->
 <component type="desktop">
-  <id>org.gnome.Connections.desktop</id>
+  <id>@app-id@.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
   <name>Connections</name>