xsettings: Make it able to run on demand

There's some changes in how this service is started:
- Instead of it being part of the gnome-session target initialization
  chain, it now depends on a new gnome-session-x11-services target.
  Initialization of this target is left up in the air here, and may
  happen during startup or at any random point during the running
  session. The same analogous behavior will be seen at shutdown.
- The Restart condition has been softened to on-abnormal, as unclean
  exits are somewhat unavoidable on Xwayland restart scenarios. Other
  crashes or abnormal signals should still be intercepted as usual,
  and lead to the fail whale.

1 files changed, 6 insertions, 2 deletions

diff --git a/plugins/meson.build b/plugins/meson.build
index 547e8bdb..a01017af 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -34,8 +34,8 @@ if enable_wwan
 endif
 
 plugin_install_extra_wants = {
+  'xsettings': ['gnome-session-x11-services.target.wants/'],
 #  'dummy': ['required-started.target.wants/'],
-#  'xsettings': ['gnome-session-x11.target.wants/'],
 #  'wacom': ['wacom.target.wants/'],
 #  'smartcard': ['smartcard.target.wants/'],
 }
@@ -107,7 +107,11 @@ foreach plugin: enabled_plugins_file
         install_dir: systemd_userunitdir
      )
 
-     wants = ['gnome-session-initialized.target.wants/']
+     wants = []
+     if plugin_name != 'xsettings'
+       wants += ['gnome-session-initialized.target.wants/']
+     endif
+
      if plugin_name in plugin_install_extra_wants
        wants += [plugin_install_extra_wants[plugin_name]]
      endif