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

Reduce interfaces verbosity

Browse source 
Summary: Only report about them when they're requested for the first time.

Test Plan: Been using it for a few days

Reviewers: #kwin, zzag

Reviewed By: #kwin, zzag

Subscribers: zzag, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D24535
This commit is contained in:
Aleix Pol 2019-10-10 16:34:44 +02:00
parent 9854b9bee5
commit 08d0c6a3bc
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wayland_server.cpp
View file

@ -225,10 +225,13 @@ public:
const auto servicesFound = KServiceTypeTrader::self()->query(QStringLiteral("Application"), serviceQuery); const auto servicesFound = KServiceTypeTrader::self()->query(QStringLiteral("Application"), serviceQuery);
if (servicesFound.isEmpty()) { if (servicesFound.isEmpty()) {
qCDebug(KWIN_CORE) << "Could not find the desktop file for" << client->executablePath();
return {}; return {};
} }
return servicesFound.first()->property("X-KDE-Wayland-Interfaces").toStringList(); const auto interfaces = servicesFound.first()->property("X-KDE-Wayland-Interfaces").toStringList();
qCDebug(KWIN_CORE) << "Interfaces for" << client->executablePath() << interfaces;
return interfaces;
} }
QSet<QByteArray> interfacesBlackList = {"org_kde_kwin_remote_access_manager", "org_kde_plasma_window_management", "org_kde_kwin_fake_input", "org_kde_kwin_keystate"}; QSet<QByteArray> interfacesBlackList = {"org_kde_kwin_remote_access_manager", "org_kde_plasma_window_management", "org_kde_kwin_fake_input", "org_kde_kwin_keystate"};
@ -253,7 +256,6 @@ public:
requestedInterfaces = fetchRequestedInterfaces(client); requestedInterfaces = fetchRequestedInterfaces(client);
client->setProperty("requestedInterfaces", requestedInterfaces); client->setProperty("requestedInterfaces", requestedInterfaces);
} }
qCDebug(KWIN_CORE) << "interfaces for" << client->executablePath() << requestedInterfaces << interfaceName << requestedInterfaces.toStringList().contains(QString::fromUtf8(interfaceName));
if (!requestedInterfaces.toStringList().contains(QString::fromUtf8(interfaceName))) { if (!requestedInterfaces.toStringList().contains(QString::fromUtf8(interfaceName))) {
qCWarning(KWIN_CORE) << "Did not grant the interface" << interfaceName << "to" << client->executablePath() << ". Please request it under X-KDE-Wayland-Interfaces"; qCWarning(KWIN_CORE) << "Did not grant the interface" << interfaceName << "to" << client->executablePath() << ". Please request it under X-KDE-Wayland-Interfaces";
return false; return false;