From 05d21b6b25ce2d9c8e0291747868520d46a8c916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 13 Oct 2016 13:57:34 +0200 Subject: [PATCH] Use new PlasmaWindowInterface::setIcon Summary: This allows to pass also Xwayland icons to the task manager. Reviewers: #kwin, #plasma_on_wayland, hein Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D3050 --- abstract_client.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/abstract_client.cpp b/abstract_client.cpp index 8eb6476012..356baf4f11 100644 --- a/abstract_client.cpp +++ b/abstract_client.cpp @@ -673,7 +673,7 @@ void AbstractClient::setupWindowManagementInterface() w->setMaximizeable(isMaximizable()); w->setMinimizeable(isMinimizable()); w->setFullscreenable(isFullScreenable()); - w->setThemedIconName(icon().name().isEmpty() ? QStringLiteral("xorg") : icon().name()); + w->setIcon(icon()); w->setAppId(QString::fromUtf8(resourceName())); w->setSkipTaskbar(skipTaskbar()); w->setShadeable(isShadeable()); @@ -713,8 +713,7 @@ void AbstractClient::setupWindowManagementInterface() connect(this, &AbstractClient::demandsAttentionChanged, w, [w, this] { w->setDemandsAttention(isDemandingAttention()); }); connect(this, &AbstractClient::iconChanged, w, [w, this] { - const QIcon i = icon(); - w->setThemedIconName(i.name().isEmpty() ? QStringLiteral("xorg") : i.name()); + w->setIcon(icon()); } ); connect(this, &AbstractClient::windowClassChanged, w,