From 8741d1a7ec22fc40d7fa1dff0501eeabd48270b6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 20 Aug 2023 18:28:27 +0300 Subject: [PATCH] startkde: selectively export variables to the D-Bus activation environment otherwise the variables may persist trough the Katana session (e.g. if D-Bus was not launched by `startkde`) and affect other desktop environments and X11 sessions Signed-off-by: Ivailo Monev --- startkde.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/startkde.cmake b/startkde.cmake index 1ebf83e5..f1dd31f1 100644 --- a/startkde.cmake +++ b/startkde.cmake @@ -129,7 +129,8 @@ XDG_CURRENT_DESKTOP=KDE export XDG_CURRENT_DESKTOP # For session services that require X11, check for XDG_CURRENT_DESKTOP, etc. -dbus-update-activation-environment --all +dbus-update-activation-environment DISPLAY XAUTHORITY XDG_CURRENT_DESKTOP \ + KDE_FULL_SESSION KDE_SESSION_VERSION KDE_SESSION_UID # Start kcminit_startup kcminit_startup @@ -161,4 +162,7 @@ unset KDE_SESSION_VERSION xprop -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID +dbus-update-activation-environment XDG_CURRENT_DESKTOP="" \ + KDE_FULL_SESSION="" KDE_SESSION_VERSION="" KDE_SESSION_UID="" + echo 'startkde: Done.' 1>&2