From 6d21deb6e48627922fb223a4281ade46d6d230ec Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Thu, 15 Dec 2022 00:56:11 +0100 Subject: Properly use X11 startup ids When one instance of Dolphin activates another it passes a startupId (X11) / activation token (wayland) along. On X11 this is passed using the DESKTOP_STARTUP_ID environment variable. The code tries to read that through KStartupInfo::startupId(). That doesn't work though, since Qt at startup reads the environment variable afterwards. However, it is nice enough to allow us to access it through QX11Info::nextStartupId(). Use that to read the token in the first instance and pass it to the second instance like we do on Wayland The user-facing impact of this is minimal since KStartupInfo::setNewStartupId internally falls back to KWindowSystem::forceActiveWindow when no startupId is passed. --- src/config-dolphin.h.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'src/config-dolphin.h.cmake') diff --git a/src/config-dolphin.h.cmake b/src/config-dolphin.h.cmake index 61440cf3c..af78c8622 100644 --- a/src/config-dolphin.h.cmake +++ b/src/config-dolphin.h.cmake @@ -3,3 +3,4 @@ #cmakedefine01 HAVE_KUSERFEEDBACK #cmakedefine01 HAVE_PACKAGEKIT #cmakedefine01 HAVE_TERMINAL +#cmakedefine01 HAVE_X11 -- cgit v1.3.1