diff options
| author | Benjamin Berg <bberg@redhat.com> | 2019-04-23 10:36:14 +0200 |
|---|---|---|
| committer | Will Thompson <will@willthompson.co.uk> | 2019-08-04 06:21:26 +0100 |
| commit | 9a9432fa87ab86691da8442b2c20995c3d12768e (patch) | |
| tree | a58eac76afa418dfb1cf62609c21e12a3bd0a0f1 /data | |
| parent | 74ba191c5625114a8565920cf4dcb60e04584968 (diff) | |
| download | gnome-initial-setup-9a9432fa87ab86691da8442b2c20995c3d12768e.tar.gz | |
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.
Diffstat (limited to 'data')
| -rw-r--r-- | data/gnome-initial-setup.session | 3 | ||||
| -rw-r--r-- | data/meson.build | 10 | ||||
| -rw-r--r-- | data/setup-shell.desktop | 8 |
3 files changed, 1 insertions, 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 @@ -25,16 +25,6 @@ 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( input: files('gnome-initial-setup.desktop.in.in'), output: 'gnome-initial-setup.desktop.in', diff --git a/data/setup-shell.desktop b/data/setup-shell.desktop deleted file mode 100644 index cce175e..0000000 --- a/data/setup-shell.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=GNOME Shell -Exec=gnome-shell --mode=initial-setup -X-GNOME-AutoRestart=true -X-GNOME-Autostart-Phase=DisplayServer -X-GNOME-Provides=panel;windowmanager; -X-GNOME-Autostart-Notify=true |