From 7340ac59e0f14509f920bf79f290bc1134ac622c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Sat, 9 Jun 2012 13:36:53 +0200 Subject: [PATCH] don't consider matching activity list sizes as ALL if size is "1" CCBUG: 301239 REVIEW: 105195 --- client.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client.cpp b/client.cpp index c63af150a1..ec88d5ec44 100644 --- a/client.cpp +++ b/client.cpp @@ -1630,7 +1630,8 @@ void Client::setOnActivities(QStringList newActivitiesList) newActivitiesList = joinedActivitiesList.split(',', QString::SkipEmptyParts); QStringList allActivities = workspace()->activityList(); - if (newActivitiesList.size() == allActivities.size() || newActivitiesList.isEmpty() || + if ( newActivitiesList.isEmpty() || + (newActivitiesList.count() > 1 && newActivitiesList.count() == allActivities.count()) || (newActivitiesList.count() == 1 && newActivitiesList.at(0) == "ALL")) { activityList.clear(); XChangeProperty(display(), window(), atoms->activities, XA_STRING, 8,