[gnome-initial-setup/wip/benzea/systemd-user: 20/22] data: Rely on GDM setting initial setup shell mode

[Will Thompson <wjt src gnome org>]

commit 9a9432fa87ab86691da8442b2c20995c3d12768e
Author: Benjamin Berg <bberg redhat com>
Date:   Tue Apr 23 10:36:14 2019 +0200

    data: Rely on GDM setting initial setup shell mode
    
    For initial-setup to work, we need GDM anyway. GDM already sets the mode
    for GNOME shell, so there is no need for a drop-in replacement
    setup-shell.desktop file.
    
    Remove setup-shell.desktop, change the RequiredComponents to use
    org.gnome.Shell as usual and rely on GDM to set the
    GNOME_SHELL_SESSION_MODE environment variable appropriately.

 data/gnome-initial-setup.session |  3 +--
 data/meson.build                 | 10 ----------
 data/setup-shell.desktop         |  8 --------
 3 files changed, 1 insertion(+), 20 deletions(-)
---
diff --git a/data/gnome-initial-setup.session b/data/gnome-initial-setup.session
index e4c5460..f6d7e92 100644
--- a/data/gnome-initial-setup.session
+++ b/data/gnome-initial-setup.session
@@ -1,4 +1,3 @@
 [GNOME Session]
 Name=GNOME Initial Setup
-RequiredComponents=setup-shell;gnome-initial-setup;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
-
+RequiredComponents=org.gnome.Shell;gnome-initial-setup;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
diff --git a/data/meson.build b/data/meson.build
index 8fa6f29..817d8ef 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -23,16 +23,6 @@ foreach desktop_file: autostart_files
     )
 endforeach
 
-i18n.merge_file(
-    'desktop',
-    input: 'setup-shell.desktop',
-    output: 'setup-shell.desktop',
-    install_dir: join_paths(data_dir, 'gdm', 'greeter', 'applications'),
-    po_dir: po_dir,
-    install: true,
-    type: 'desktop'
-)
-
 i18n.merge_file(
     'desktop',
     input: configure_file(