fix: XDG_CURRENT_DESKTOP is wrong

use DDE as XDG_CURRENT_DESKTOP Log:
linuxdeepin · Dec 22, 2023 · bb4eb37 · bb4eb37
1 parent b16915c
commit bb4eb37
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/data/wayland-sessions/treeland.desktop.in b/data/wayland-sessions/treeland.desktop.in
@@ -4,5 +4,5 @@ Comment=This session is DDE single wayland
 Exec=${CMAKE_INSTALL_FULL_LIBEXECDIR}/treeland-fake-session
 TryExec=${CMAKE_INSTALL_FULL_LIBEXECDIR}/treeland-fake-session
 Type=Application
-DesktopNames=TreeLand
+DesktopNames=DDE
 X-DDE-SINGLE-WAYLAND=true
diff --git a/src/treeland/treeland-fake-session/fake-session.cpp b/src/treeland/treeland-fake-session/fake-session.cpp
@@ -207,11 +207,12 @@ FakeSession::FakeSession(int argc, char* argv[])
     QProcess::startDetached("dde-shell", {"-p", "org.deepin.ds.dock"});
 
     QDBusInterface systemd("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager");
-    systemd.call("UnsetEnvironment", QStringList{"DISPLAY", "WAYLAND_DISPLAY", "XDG_SESSION_TYPE", "XDG_CURRENT_DESKTOP"});
+    systemd.call("UnsetEnvironment", QStringList{"DISPLAY", "WAYLAND_DISPLAY", "XDG_SESSION_TYPE"});
     systemd.call("SetEnvironment", QStringList{
-                                       "XDG_CURRENT_DESKTOP=DDE",
+                                       QString("DISPLAY=%1").arg(qgetenv("DISPLAY")),
                                        QString("WAYLAND_DISPLAY=%1").arg(qgetenv("WAYLAND_DISPLAY")),
-                                       "XDG_SESSION_TYPE=wayland"
+                                       QString("XDG_SESSION_TYPE=%1").arg(qgetenv("XDG_SESSION_TYPE")),
+                                       QString("XDG_CURRENT_DESKTOP=%1").arg(qgetenv("XDG_CURRENT_DESKTOP")),
                                    }
     );
 }