diff options
author | Iain Lane <iainl@gnome.org> | 2018-06-08 12:16:35 +0100 |
---|---|---|
committer | Benjamin Berg <bberg@redhat.com> | 2019-03-25 11:32:21 +0100 |
commit | db15fa106579efef9b64ac6d68faa0ff67db1850 (patch) | |
tree | c0e19ef5ddd13d94f56a974eb7909716cb909523 | |
parent | 931931398f906346d47b9d68cb16e36e953b2ee8 (diff) | |
download | gnome-settings-daemon-wip/laney/systemd-user.tar.gz |
Install desktop files as Hidden=true to systemd-user directorywip/laney/systemd-user
This directory is set up by gnome-session as a place for services to
drop configuration needed on systemd --user sessions. We use it to
override the XDG autostart desktop files, as we're started by systemd
here.
20 files changed, 60 insertions, 1 deletions
diff --git a/plugins/a11y-settings/org.gnome.SettingsDaemon.A11ySettings.desktop.in b/plugins/a11y-settings/org.gnome.SettingsDaemon.A11ySettings.desktop.in index 2f0ac936..04b5697e 100644 --- a/plugins/a11y-settings/org.gnome.SettingsDaemon.A11ySettings.desktop.in +++ b/plugins/a11y-settings/org.gnome.SettingsDaemon.A11ySettings.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/clipboard/org.gnome.SettingsDaemon.Clipboard.desktop.in b/plugins/clipboard/org.gnome.SettingsDaemon.Clipboard.desktop.in index a7ca15be..c8230de1 100644 --- a/plugins/clipboard/org.gnome.SettingsDaemon.Clipboard.desktop.in +++ b/plugins/clipboard/org.gnome.SettingsDaemon.Clipboard.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/color/org.gnome.SettingsDaemon.Color.desktop.in b/plugins/color/org.gnome.SettingsDaemon.Color.desktop.in index a9d72231..19bc825a 100644 --- a/plugins/color/org.gnome.SettingsDaemon.Color.desktop.in +++ b/plugins/color/org.gnome.SettingsDaemon.Color.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/common/meson.build b/plugins/common/meson.build index 2f18c2c6..928e7f79 100644 --- a/plugins/common/meson.build +++ b/plugins/common/meson.build @@ -41,3 +41,27 @@ libcommon_dep = declare_dependency( include_directories: common_inc, link_with: libcommon ) + +# this doesn't really belong here, but we can't configure_file the same file +# twice so it can't go in ../meson.build +# https://github.com/mesonbuild/meson/issues/3714 + +plugins_conf_hidden = configuration_data() +plugins_conf_hidden.set('libexecdir', gsd_libexecdir) +plugins_conf_hidden.set('hidden', 'Hidden=true') + +foreach plugin: enabled_plugins_file + plugin_name = plugin[0] + desktop = 'org.gnome.SettingsDaemon.@0@.desktop'.format(plugin[1]) + desktop_in_file = plugin[2] + + if not ['common', 'dummy'].contains(plugin_name) + configure_file( + input: desktop_in_file, + output: desktop, + configuration: plugins_conf_hidden, + install: true, + install_dir: join_paths(gsd_datadir, 'gnome-session', 'systemd-user', 'autostart') + ) + endif +endforeach diff --git a/plugins/datetime/org.gnome.SettingsDaemon.Datetime.desktop.in b/plugins/datetime/org.gnome.SettingsDaemon.Datetime.desktop.in index ac99312f..f50344c1 100644 --- a/plugins/datetime/org.gnome.SettingsDaemon.Datetime.desktop.in +++ b/plugins/datetime/org.gnome.SettingsDaemon.Datetime.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/dummy/org.gnome.SettingsDaemon.Dummy.desktop.in b/plugins/dummy/org.gnome.SettingsDaemon.Dummy.desktop.in index fa80c87d..569eca53 100644 --- a/plugins/dummy/org.gnome.SettingsDaemon.Dummy.desktop.in +++ b/plugins/dummy/org.gnome.SettingsDaemon.Dummy.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/housekeeping/org.gnome.SettingsDaemon.Housekeeping.desktop.in b/plugins/housekeeping/org.gnome.SettingsDaemon.Housekeeping.desktop.in index a557ff04..6275618d 100644 --- a/plugins/housekeeping/org.gnome.SettingsDaemon.Housekeeping.desktop.in +++ b/plugins/housekeeping/org.gnome.SettingsDaemon.Housekeeping.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/keyboard/org.gnome.SettingsDaemon.Keyboard.desktop.in b/plugins/keyboard/org.gnome.SettingsDaemon.Keyboard.desktop.in index 9cf0fbd4..1cdd329a 100644 --- a/plugins/keyboard/org.gnome.SettingsDaemon.Keyboard.desktop.in +++ b/plugins/keyboard/org.gnome.SettingsDaemon.Keyboard.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/media-keys/org.gnome.SettingsDaemon.MediaKeys.desktop.in b/plugins/media-keys/org.gnome.SettingsDaemon.MediaKeys.desktop.in index de53c3f1..b569a7d6 100644 --- a/plugins/media-keys/org.gnome.SettingsDaemon.MediaKeys.desktop.in +++ b/plugins/media-keys/org.gnome.SettingsDaemon.MediaKeys.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/meson.build b/plugins/meson.build index ae3b26fb..d2ece0f7 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -33,13 +33,29 @@ endif plugins_conf = configuration_data() plugins_conf.set('libexecdir', gsd_libexecdir) +plugins_conf.set('hidden', '') plugins_deps = [libgsd_dep] plugins_cflags = ['-DGNOME_SETTINGS_LOCALEDIR="@0@"'.format(gsd_localedir)] +enabled_plugins_file = [] + foreach plugin: [['common', '']] + enabled_plugins plugin_name = plugin[0] + desktop = 'org.gnome.SettingsDaemon.@0@.desktop'.format(plugin[1]) + + if plugin[1] == '' # common or dummy + desktop_in_file = '' + else + desktop_in_file = files(join_paths(plugin_name, desktop + '.in')) + endif + + enabled_plugins_file += [[plugin_name, plugin[1], desktop_in_file]] +endforeach + +foreach plugin: enabled_plugins_file + plugin_name = plugin[0] plugin_name_case = plugin[1] plugin_dbus_name='org.gnome.SettingsDaemon.@0@'.format(plugin_name_case) @@ -51,6 +67,7 @@ foreach plugin: [['common', '']] + enabled_plugins if not ['common', 'dummy'].contains(plugin_name) desktop = 'org.gnome.SettingsDaemon.@0@.desktop'.format(plugin[1]) + desktop_in_file = plugin[2] user_unit = 'gsd-@0@.service'.format(plugin_name) unit_conf = configuration_data() @@ -58,7 +75,7 @@ foreach plugin: [['common', '']] + enabled_plugins unit_conf.set('plugin_dbus_name', plugin_dbus_name) configure_file( - input: join_paths(plugin_name, desktop + '.in'), + input: desktop_in_file, output: desktop, configuration: plugins_conf, install: true, diff --git a/plugins/mouse/org.gnome.SettingsDaemon.Mouse.desktop.in b/plugins/mouse/org.gnome.SettingsDaemon.Mouse.desktop.in index fb4c7d3d..e516feff 100644 --- a/plugins/mouse/org.gnome.SettingsDaemon.Mouse.desktop.in +++ b/plugins/mouse/org.gnome.SettingsDaemon.Mouse.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/power/org.gnome.SettingsDaemon.Power.desktop.in b/plugins/power/org.gnome.SettingsDaemon.Power.desktop.in index 82d1505d..c1733e75 100644 --- a/plugins/power/org.gnome.SettingsDaemon.Power.desktop.in +++ b/plugins/power/org.gnome.SettingsDaemon.Power.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/print-notifications/org.gnome.SettingsDaemon.PrintNotifications.desktop.in b/plugins/print-notifications/org.gnome.SettingsDaemon.PrintNotifications.desktop.in index bbcd6abb..ffc8e4d2 100644 --- a/plugins/print-notifications/org.gnome.SettingsDaemon.PrintNotifications.desktop.in +++ b/plugins/print-notifications/org.gnome.SettingsDaemon.PrintNotifications.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/rfkill/org.gnome.SettingsDaemon.Rfkill.desktop.in b/plugins/rfkill/org.gnome.SettingsDaemon.Rfkill.desktop.in index baa845b6..c7711550 100644 --- a/plugins/rfkill/org.gnome.SettingsDaemon.Rfkill.desktop.in +++ b/plugins/rfkill/org.gnome.SettingsDaemon.Rfkill.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/screensaver-proxy/org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in b/plugins/screensaver-proxy/org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in index 43822fb4..7297129d 100644 --- a/plugins/screensaver-proxy/org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in +++ b/plugins/screensaver-proxy/org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/sharing/org.gnome.SettingsDaemon.Sharing.desktop.in b/plugins/sharing/org.gnome.SettingsDaemon.Sharing.desktop.in index 891ba205..ca0e143c 100644 --- a/plugins/sharing/org.gnome.SettingsDaemon.Sharing.desktop.in +++ b/plugins/sharing/org.gnome.SettingsDaemon.Sharing.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.desktop.in b/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.desktop.in index 71d058c2..de538dcd 100644 --- a/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.desktop.in +++ b/plugins/smartcard/org.gnome.SettingsDaemon.Smartcard.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/sound/org.gnome.SettingsDaemon.Sound.desktop.in b/plugins/sound/org.gnome.SettingsDaemon.Sound.desktop.in index 2048b01b..111a18d9 100644 --- a/plugins/sound/org.gnome.SettingsDaemon.Sound.desktop.in +++ b/plugins/sound/org.gnome.SettingsDaemon.Sound.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/wacom/org.gnome.SettingsDaemon.Wacom.desktop.in b/plugins/wacom/org.gnome.SettingsDaemon.Wacom.desktop.in index efa5bf00..40fbf140 100644 --- a/plugins/wacom/org.gnome.SettingsDaemon.Wacom.desktop.in +++ b/plugins/wacom/org.gnome.SettingsDaemon.Wacom.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ diff --git a/plugins/xsettings/org.gnome.SettingsDaemon.XSettings.desktop.in b/plugins/xsettings/org.gnome.SettingsDaemon.XSettings.desktop.in index 249fafd7..2c046016 100644 --- a/plugins/xsettings/org.gnome.SettingsDaemon.XSettings.desktop.in +++ b/plugins/xsettings/org.gnome.SettingsDaemon.XSettings.desktop.in @@ -7,3 +7,4 @@ NoDisplay=true X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=true +@hidden@ |