aboutsummaryrefslogtreecommitdiff
path: root/x11/sddm/files/patch-src_daemon_Display.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'x11/sddm/files/patch-src_daemon_Display.cpp')
-rw-r--r--x11/sddm/files/patch-src_daemon_Display.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/x11/sddm/files/patch-src_daemon_Display.cpp b/x11/sddm/files/patch-src_daemon_Display.cpp
index 43db60d9e3c3..d4e583a60caf 100644
--- a/x11/sddm/files/patch-src_daemon_Display.cpp
+++ b/x11/sddm/files/patch-src_daemon_Display.cpp
@@ -7,9 +7,9 @@ file defines DesktopNames. Our xinitrc.desktop does not set it because that
may confuse the desktop session started from ~/.xinitrc. These environment
variables are used for OnlyShowIn and NotShowIn in .desktop files.
---- src/daemon/Display.cpp.orig 2019-03-13 09:22:35 UTC
+--- src/daemon/Display.cpp.orig 2020-11-03 09:55:31 UTC
+++ src/daemon/Display.cpp
-@@ -321,11 +321,13 @@ namespace SDDM {
+@@ -320,10 +320,12 @@ namespace SDDM {
env.insert(QStringLiteral("XDG_SEAT_PATH"), daemonApp->displayManager()->seatPath(seat()->name()));
env.insert(QStringLiteral("XDG_SESSION_PATH"), daemonApp->displayManager()->sessionPath(QStringLiteral("Session%1").arg(daemonApp->newSessionId())));
env.insert(QStringLiteral("DESKTOP_SESSION"), session.desktopSession());
@@ -18,8 +18,7 @@ variables are used for OnlyShowIn and NotShowIn in .desktop files.
env.insert(QStringLiteral("XDG_SESSION_CLASS"), QStringLiteral("user"));
env.insert(QStringLiteral("XDG_SESSION_TYPE"), session.xdgSessionType());
env.insert(QStringLiteral("XDG_SEAT"), seat()->name());
-
+ if (!session.desktopNames().isEmpty())
env.insert(QStringLiteral("XDG_SESSION_DESKTOP"), session.desktopNames());
- if (seat()->name() == QLatin1String("seat0")) {
- env.insert(QStringLiteral("XDG_VTNR"), QString::number(vt));
+
+ m_auth->insertEnvironment(env);