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.

19 files changed, 4 insertions, 165 deletions

diff --git a/plugins/a11y-settings/org.gnome.SettingsDaemon.A11ySettings.desktop.in b/plugins/a11y-settings/org.gnome.SettingsDaemon.A11ySettings.desktop.in
deleted file mode 100644
index 02faf401..00000000
--- a/plugins/a11y-settings/org.gnome.SettingsDaemon.A11ySettings.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's a11y-settings plugin
-Exec=@libexecdir@/gsd-a11y-settings
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/color/org.gnome.SettingsDaemon.Color.desktop.in b/plugins/color/org.gnome.SettingsDaemon.Color.desktop.in
deleted file mode 100644
index 6cf58d41..00000000
--- a/plugins/color/org.gnome.SettingsDaemon.Color.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's color plugin
-Exec=@libexecdir@/gsd-color
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/datetime/org.gnome.SettingsDaemon.Datetime.desktop.in b/plugins/datetime/org.gnome.SettingsDaemon.Datetime.desktop.in
deleted file mode 100644
index 567b9a0a..00000000
--- a/plugins/datetime/org.gnome.SettingsDaemon.Datetime.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's datetime plugin
-Exec=@libexecdir@/gsd-datetime
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/housekeeping/org.gnome.SettingsDaemon.Housekeeping.desktop.in b/plugins/housekeeping/org.gnome.SettingsDaemon.Housekeeping.desktop.in
deleted file mode 100644
index e13d3669..00000000
--- a/plugins/housekeeping/org.gnome.SettingsDaemon.Housekeeping.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's housekeeping plugin
-Exec=@libexecdir@/gsd-housekeeping
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/media-keys/org.gnome.SettingsDaemon.MediaKeys.desktop.in b/plugins/media-keys/org.gnome.SettingsDaemon.MediaKeys.desktop.in
deleted file mode 100644
index 58f4cf4e..00000000
--- a/plugins/media-keys/org.gnome.SettingsDaemon.MediaKeys.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's media-keys plugin
-Exec=@libexecdir@/gsd-media-keys
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
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
index 04249c84..04249c84 100644
--- a/plugins/dummy/org.gnome.SettingsDaemon.Dummy.desktop.in
+++ b/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
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
diff --git a/plugins/power/org.gnome.SettingsDaemon.Power.desktop.in b/plugins/power/org.gnome.SettingsDaemon.Power.desktop.in
deleted file mode 100644
index 81db05ff..00000000
--- a/plugins/power/org.gnome.SettingsDaemon.Power.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's power plugin
-Exec=@libexecdir@/gsd-power
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/print-notifications/org.gnome.SettingsDaemon.PrintNotifications.desktop.in b/plugins/print-notifications/org.gnome.SettingsDaemon.PrintNotifications.desktop.in
deleted file mode 100644
index 146cc16e..00000000
--- a/plugins/print-notifications/org.gnome.SettingsDaemon.PrintNotifications.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's print-notifications plugin
-Exec=@libexecdir@/gsd-print-notifications
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/rfkill/org.gnome.SettingsDaemon.Rfkill.desktop.in b/plugins/rfkill/org.gnome.SettingsDaemon.Rfkill.desktop.in
deleted file mode 100644
index 2607dd00..00000000
--- a/plugins/rfkill/org.gnome.SettingsDaemon.Rfkill.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's rfkill plugin
-Exec=@libexecdir@/gsd-rfkill
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/screensaver-proxy/org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in b/plugins/screensaver-proxy/org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in
deleted file mode 100644
index 97a339f0..00000000
--- a/plugins/screensaver-proxy/org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's screensaver-proxy plugin
-Exec=@libexecdir@/gsd-screensaver-proxy
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/sharing/org.gnome.SettingsDaemon.Sharing.desktop.in b/plugins/sharing/org.gnome.SettingsDaemon.Sharing.desktop.in
deleted file mode 100644
index dd5dc72b..00000000
--- a/plugins/sharing/org.gnome.SettingsDaemon.Sharing.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's sharing plugin
-Exec=@libexecdir@/gsd-sharing
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.desktop.in b/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.desktop.in
deleted file mode 100644
index 9c5f3458..00000000
--- a/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's smartcard plugin
-Exec=@libexecdir@/gsd-smartcard
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/sound/org.gnome.SettingsDaemon.Sound.desktop.in b/plugins/sound/org.gnome.SettingsDaemon.Sound.desktop.in
deleted file mode 100644
index 4701a2a0..00000000
--- a/plugins/sound/org.gnome.SettingsDaemon.Sound.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's sound plugin
-Exec=@libexecdir@/gsd-sound
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/usb-protection/org.gnome.SettingsDaemon.UsbProtection.desktop.in b/plugins/usb-protection/org.gnome.SettingsDaemon.UsbProtection.desktop.in
deleted file mode 100644
index 659fc39d..00000000
--- a/plugins/usb-protection/org.gnome.SettingsDaemon.UsbProtection.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's USB protection plugin
-Exec=@libexecdir@/gsd-usb-protection
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
-
diff --git a/plugins/wacom/org.gnome.SettingsDaemon.Wacom.desktop.in b/plugins/wacom/org.gnome.SettingsDaemon.Wacom.desktop.in
deleted file mode 100644
index c10b461c..00000000
--- a/plugins/wacom/org.gnome.SettingsDaemon.Wacom.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's wacom plugin
-Exec=@libexecdir@/gsd-wacom
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/wwan/org.gnome.SettingsDaemon.Wwan.desktop.in b/plugins/wwan/org.gnome.SettingsDaemon.Wwan.desktop.in
deleted file mode 100644
index 61ea7747..00000000
--- a/plugins/wwan/org.gnome.SettingsDaemon.Wwan.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's Wwan plugin
-Exec=@libexecdir@/gsd-wwan
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@
diff --git a/plugins/xsettings/org.gnome.SettingsDaemon.XSettings.desktop.in b/plugins/xsettings/org.gnome.SettingsDaemon.XSettings.desktop.in
deleted file mode 100644
index 59086a78..00000000
--- a/plugins/xsettings/org.gnome.SettingsDaemon.XSettings.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GNOME Settings Daemon's xsettings plugin
-Exec=@libexecdir@/gsd-xsettings
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=Initialization
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
-X-GNOME-HiddenUnderSystemd=@systemd_hidden@