[connections/add-dev-profile: 3/3] build, app: Use "Devel" icon variant in the "development" profile

[Felipe Borges <felipeborges src gnome org>]

commit 30c5ca7d8105f8e9fc6642b8c066b59e612a9393
Author: Felipe Borges <felipeborges gnome org>
Date:   Mon Oct 19 12:37:01 2020 +0200

    build, app: Use "Devel" icon variant in the "development" profile

 data/meson.build                      | 28 ++++++++++++++++++++++------
 data/org.gnome.Connections.desktop.in |  2 +-
 data/org.gnome.Connections.service.in |  2 +-
 src/application.vala                  |  2 +-
 4 files changed, 25 insertions(+), 9 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index cf4a6f6..0ebbb6a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,5 +1,11 @@
+desktop_conf = configuration_data()
+desktop_conf.set('icon', application_id)
 desktop_file = i18n.merge_file(
-  input: 'org.gnome.Connections.desktop.in',
+  input: configure_file(
+    input: files('org.gnome.Connections.desktop.in'),
+    output: 'org.gnome.Connections.desktop.in',
+    configuration: desktop_conf
+  ),
   output: '@0@.desktop'.format(application_id),
   type: 'desktop',
   po_dir: '../po',
@@ -29,9 +35,10 @@ if appstream_util.found()
   )
 endif
 
-dbus_conf = configuration_data ()
-dbus_conf.set ('bindir', join_paths (get_option ('prefix'), get_option ('bindir')))
-configure_file (
+dbus_conf = configuration_data()
+dbus_conf.set('bindir', join_paths (get_option ('prefix'), get_option ('bindir')))
+dbus_conf.set('appid', application_id)
+configure_file(
   input: 'org.gnome.Connections.service.in',
   output: '@0@.service'.format(application_id),
   configuration: dbus_conf,
@@ -40,8 +47,17 @@ configure_file (
 )
 
 # Icons
-install_subdir('icons',
-  install_dir: join_paths(get_option('datadir')),
+icon_dir = join_paths('icons', 'hicolor', 'scalable', 'apps')
+install_data(
+  join_paths(icon_dir, '@0@.svg'.format(application_id)),
+  install_dir: join_paths(get_option('datadir'), icon_dir),
+  rename: '@0@.svg'.format(application_id)
+)
+
+icon_dir = join_paths('icons', 'hicolor', 'symbolic', 'apps')
+install_data(
+  join_paths(icon_dir, 'org.gnome.Connections-symbolic.svg'),
+  install_dir: join_paths(get_option('datadir'), icon_dir)
 )
 
 install_data('org.gnome.Connections.gschema.xml',
diff --git a/data/org.gnome.Connections.desktop.in b/data/org.gnome.Connections.desktop.in
index 6b0db4c..a94c8ce 100644
--- a/data/org.gnome.Connections.desktop.in
+++ b/data/org.gnome.Connections.desktop.in
@@ -6,6 +6,6 @@ Type=Application
 Categories=GTK;
 StartupNotify=true
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Connections
+Icon=@icon@
 DBusActivatable=true
 MimeType=application/x-vnc
diff --git a/data/org.gnome.Connections.service.in b/data/org.gnome.Connections.service.in
index 4063127..f21aa1b 100644
--- a/data/org.gnome.Connections.service.in
+++ b/data/org.gnome.Connections.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gnome.Connections
+Name=@appid@
 Exec=@bindir@/connections --gapplication-service
diff --git a/src/application.vala b/src/application.vala
index 65ae11b..eecd4ab 100644
--- a/src/application.vala
+++ b/src/application.vala
@@ -79,7 +79,7 @@ namespace Connections {
                                    "license-type", Gtk.License.GPL_3_0,
                                    "program-name", _("Connections"),
                                    "wrap-license", true,
-                                   "logo-icon-name", "org.gnome.Connections",
+                                   "logo-icon-name", application_id,
                                    "version", Config.VERSION);
         }