From c06d8975d5bf9032c2c1e4050468cfc19891fffe Mon Sep 17 00:00:00 2001 From: Carson Black Date: Thu, 19 Mar 2020 15:28:36 -0400 Subject: [PATCH] Fixes for D27959 Fixes issues that flew under the radar in D27959, namely: - Missing KWindowInfo flags - Returning service name instead of object path Reviewed-By: kbroulik --- libtaskmanager/xwindowtasksmodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libtaskmanager/xwindowtasksmodel.cpp b/libtaskmanager/xwindowtasksmodel.cpp index ff9169394..f02f9ac0a 100644 --- a/libtaskmanager/xwindowtasksmodel.cpp +++ b/libtaskmanager/xwindowtasksmodel.cpp @@ -50,7 +50,7 @@ namespace TaskManager static const NET::Properties windowInfoFlags = NET::WMState | NET::XAWMState | NET::WMDesktop | NET::WMVisibleName | NET::WMGeometry | NET::WMFrameExtents | NET::WMWindowType | NET::WMPid; static const NET::Properties2 windowInfoFlags2 = NET::WM2DesktopFileName | NET::WM2Activities | - NET::WM2WindowClass | NET::WM2AllowedActions; + NET::WM2WindowClass | NET::WM2AllowedActions | NET::WM2AppMenuObjectPath | NET::WM2AppMenuServiceName; class Q_DECL_HIDDEN XWindowTasksModel::Private { @@ -476,7 +476,7 @@ QString XWindowTasksModel::Private::appMenuServiceName(WId window) QString XWindowTasksModel::Private::appMenuObjectPath(WId window) { const KWindowInfo *info = windowInfo(window); - return QString::fromUtf8(info->applicationMenuServiceName()); + return QString::fromUtf8(info->applicationMenuObjectPath()); } QIcon XWindowTasksModel::Private::icon(WId window)