[gnome-settings-daemon/benzea/systemd-3-36: 2/2] plugins: Stop installing wants symlinks for GNOME session targets

[Benjamin Berg <bberg src gnome org>]

commit 488d42fde9d40e9e6fee0e7fcab285549bdac6a9
Author: Benjamin Berg <bberg redhat com>
Date:   Wed Dec 11 22:32:30 2019 +0100

    plugins: Stop installing wants symlinks for GNOME session targets
    
    With GNOME 3.36 we are going to move the definition about the systemd
    services that should be running to be per-session type. This means we
    need to stop installing those wants entries in g-s-d.

 plugins/meson.build | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/plugins/meson.build b/plugins/meson.build
index a01017af..ed1492de 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -33,7 +33,7 @@ if enable_wwan
   enabled_plugins += [['wwan', 'Wwan']]
 endif
 
-plugin_install_extra_wants = {
+plugin_install_wants = {
   'xsettings': ['gnome-session-x11-services.target.wants/'],
 #  'dummy': ['required-started.target.wants/'],
 #  'wacom': ['wacom.target.wants/'],
@@ -107,18 +107,11 @@ foreach plugin: enabled_plugins_file
         install_dir: systemd_userunitdir
      )
 
-     wants = []
-     if plugin_name != 'xsettings'
-       wants += ['gnome-session-initialized.target.wants/']
+     if plugin_name in plugin_install_wants
+       foreach target: plugin_install_wants
+         meson.add_install_script('meson-add-wants.sh', systemd_userunitdir, target, user_target)
+       endforeach
      endif
-
-     if plugin_name in plugin_install_extra_wants
-       wants += [plugin_install_extra_wants[plugin_name]]
-     endif
-
-     foreach target: wants
-       meson.add_install_script('meson-add-wants.sh', systemd_userunitdir, target, user_target)
-     endforeach
    endif
   endif