From kde-commits Wed Aug 05 22:28:35 2009 From: =?utf-8?q?Aaron=20J=2E=20Seigo?= Date: Wed, 05 Aug 2009 22:28:35 +0000 To: kde-commits Subject: KDE/kdebase/workspace/plasma/applets/tasks Message-Id: <1249511315.081564.15777.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=124951133130571 SVN commit 1007544 by aseigo: don't show which desktop if Group::desktop() returns 0, as that means "no common desktop" BUG:198523 M +7 -3 taskgroupitem.cpp --- trunk/KDE/kdebase/workspace/plasma/applets/tasks/taskgroupitem.cpp #1007543:1007544 @@ -271,9 +271,13 @@ return; } - Plasma::ToolTipContent data(m_group->name(), - i18nc("Which virtual desktop a window is currently on", "On %1", - KWindowSystem::desktopName(m_group->desktop()))); + Plasma::ToolTipContent data(m_group->name(), QString()); + int desktop = m_group->desktop(); + if (desktop != 0) { + data.setSubText(i18nc("Which virtual desktop a window is currently on", "On %1", + KWindowSystem::desktopName(m_group->desktop()))); + } + data.setImage(m_group->icon()); int i = 0;