[gnome-settings-daemon/benzea/systemd-3-36: 14/24] plugins: Use a common templates .desktop files

[Benjamin Berg <bberg src gnome org>]

commit ffd9fa4adbaee90a5cba2387c0b01caab27ea26a
Author: Benjamin Berg <bberg redhat com>
Date:   Thu Dec 12 01:23:05 2019 +0100

    plugins: Use a common templates .desktop files
    
    Currently we have no plugin that uses special flags or similar to start
    only under certain conditions. So just generate all of them from two
    template files rather than shipping seperate templates for each plugin.
    
    The idea here is to handle any possible future difference also during
    generation. This might e.g. be that we again start certain services only
    if a GSettings key is set, which would likely need to be mirrored e.g.
    in the systemd path.

 .../org.gnome.SettingsDaemon.A11ySettings.desktop.in          | 10 ----------
 plugins/color/org.gnome.SettingsDaemon.Color.desktop.in       | 10 ----------
 plugins/datetime/org.gnome.SettingsDaemon.Datetime.desktop.in | 10 ----------
 .../org.gnome.SettingsDaemon.Housekeeping.desktop.in          | 10 ----------
 .../media-keys/org.gnome.SettingsDaemon.MediaKeys.desktop.in  | 10 ----------
 plugins/meson.build                                           |  4 ++--
 plugins/{dummy => }/org.gnome.SettingsDaemon.Dummy.desktop.in |  0
 ...rd.desktop.in => org.gnome.SettingsDaemon.Real.desktop.in} |  4 ++--
 plugins/power/org.gnome.SettingsDaemon.Power.desktop.in       | 10 ----------
 .../org.gnome.SettingsDaemon.PrintNotifications.desktop.in    | 10 ----------
 plugins/rfkill/org.gnome.SettingsDaemon.Rfkill.desktop.in     | 10 ----------
 .../org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in      | 10 ----------
 plugins/sharing/org.gnome.SettingsDaemon.Sharing.desktop.in   | 10 ----------
 .../smartcard/org.gnome.SettingsDaemon.Smartcard.desktop.in   | 10 ----------
 plugins/sound/org.gnome.SettingsDaemon.Sound.desktop.in       | 10 ----------
 .../org.gnome.SettingsDaemon.UsbProtection.desktop.in         | 11 -----------
 plugins/wacom/org.gnome.SettingsDaemon.Wacom.desktop.in       | 10 ----------
 plugins/wwan/org.gnome.SettingsDaemon.Wwan.desktop.in         | 10 ----------
 .../xsettings/org.gnome.SettingsDaemon.XSettings.desktop.in   | 10 ----------
 19 files changed, 4 insertions(+), 165 deletions(-)
---
diff --git a/plugins/meson.build b/plugins/meson.build
index d74517f4..1f7de93c 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -70,9 +70,9 @@ foreach plugin: all_plugins
   desktop = 'org.gnome.SettingsDaemon.@0@.desktop'.format(plugin[1])
 
   if disabled_plugins.contains(plugin_name)
-    desktop_in_file = files(join_paths('dummy', 'org.gnome.SettingsDaemon.Dummy.desktop.in'))
+    desktop_in_file = files('org.gnome.SettingsDaemon.Dummy.desktop.in')
   else
-    desktop_in_file = files(join_paths(plugin_name, desktop + '.in'))
+    desktop_in_file = files('org.gnome.SettingsDaemon.Real.desktop.in')
   endif
 
   cflags = [
diff --git a/plugins/dummy/org.gnome.SettingsDaemon.Dummy.desktop.in 
b/plugins/org.gnome.SettingsDaemon.Dummy.desktop.in
similarity index 100%
rename from plugins/dummy/org.gnome.SettingsDaemon.Dummy.desktop.in
rename to plugins/org.gnome.SettingsDaemon.Dummy.desktop.in
diff --git a/plugins/keyboard/org.gnome.SettingsDaemon.Keyboard.desktop.in 
b/plugins/org.gnome.SettingsDaemon.Real.desktop.in
similarity index 70%
rename from plugins/keyboard/org.gnome.SettingsDaemon.Keyboard.desktop.in
rename to plugins/org.gnome.SettingsDaemon.Real.desktop.in
index 1e9e063a..ae11a86f 100644
--- a/plugins/keyboard/org.gnome.SettingsDaemon.Keyboard.desktop.in
+++ b/plugins/org.gnome.SettingsDaemon.Real.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=GNOME Settings Daemon's keyboard plugin
-Exec=@libexecdir@/gsd-keyboard
+Name=GNOME Settings Daemon's @pluginname@ plugin
+Exec=@libexecdir@/gsd-@pluginname@
 OnlyShowIn=GNOME;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization