yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xdgactivation: Properly prevent disabled activation notifications

Browse source 
The logic when checking the settings was wrong and it would always
notify unless both keys were actually disabled.

BUG: 454937
This commit is contained in:
Aleix Pol 2022-06-29 21:37:52 +02:00
parent fb57b71e75
commit 78d80123f1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/xdgactivationv1.cpp
View file

@ -78,8 +78,10 @@ QString XdgActivationV1Integration::requestToken(bool isPrivileged, SurfaceInter
if (const QString desktopFilePath = Window::findDesktopFile(appId); !desktopFilePath.isEmpty()) {
KDesktopFile df(desktopFilePath);
Window *window = Workspace::self()->activeWindow();
showNotify = (!window || appId != window->desktopFileName())
&& (df.desktopGroup().readEntry("StartupNotify", true) || df.desktopGroup().readEntry("X-KDE-StartupNotify", true));
if (!window || appId != window->desktopFileName()) {
const auto desktop = df.desktopGroup();
showNotify = desktop.readEntry("X-KDE-StartupNotify", desktop.readEntry("StartupNotify", true));
}
icon = QIcon::fromTheme(df.readIcon(), QIcon::fromTheme(QStringLiteral("system-run")));
}
m_currentActivationToken.reset(new ActivationToken{newToken, isPrivileged, surface, serial, seat, appId, showNotify, waylandServer()->plasmaActivationFeedback()->createActivation(appId)});