From 50055004f586baf27fc20d84985899978285ebb8 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 5 Aug 2019 21:46:05 +0200 Subject: [PATCH] data: Flag in desktop file that gnome-shell can be started using systemd As gnome-shell is a required component for GNOME sessions, gnome-session will currently always try to autostart it. However as we are moving towards using systemd's user instance for session startup, gnome-session should only be responsible for launching the shell when either not running under systemd or when we were built without systemd support. gnome-session can detect the former but not the latter, so communicate this via the newly added X-GNOME-HiddenUnderSystemd key in the .desktop file. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/507 https://gitlab.gnome.org/GNOME/gnome-session/merge_requests/13 --- data/meson.build | 2 ++ data/org.gnome.Shell.desktop.in.in | 1 + 2 files changed, 3 insertions(+) diff --git a/data/meson.build b/data/meson.build index 31ac4514e..48fd8631c 100644 --- a/data/meson.build +++ b/data/meson.build @@ -14,6 +14,8 @@ desktopconf = configuration_data() # file when built in a non-system prefix desktopconf.set('bindir', bindir) desktopconf.set('VERSION', meson.project_version()) +desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') + foreach desktop_file : desktop_files i18n.merge_file('desktop', input: configure_file( diff --git a/data/org.gnome.Shell.desktop.in.in b/data/org.gnome.Shell.desktop.in.in index 09543e858..1b46ef944 100644 --- a/data/org.gnome.Shell.desktop.in.in +++ b/data/org.gnome.Shell.desktop.in.in @@ -14,3 +14,4 @@ X-GNOME-Autostart-Phase=DisplayServer X-GNOME-Provides=panel;windowmanager; X-GNOME-Autostart-Notify=true X-GNOME-AutoRestart=false +X-GNOME-HiddenUnderSystemd=@systemd_hidden@