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

Map NULL_UUID activity to ALL activities

Browse source 
REVIEW: 109274
BUG: 314830
FIXED-IN: 4.10.2
This commit is contained in:
Thomas Lübking 2013-03-02 22:27:20 +01:00
parent 1bc2d7d3b7
commit c0f3895ba7
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
client.cpp
View file

@ -1518,12 +1518,16 @@ void Client::setOnActivity(const QString &activity, bool enable)
/** /**
* set exactly which activities this client is on * set exactly which activities this client is on
*/ */
#define NULL_UUID "00000000-0000-0000-0000-000000000000"
void Client::setOnActivities(QStringList newActivitiesList) void Client::setOnActivities(QStringList newActivitiesList)
{ {
QString joinedActivitiesList = newActivitiesList.join(","); QString joinedActivitiesList = newActivitiesList.join(",");
joinedActivitiesList = rules()->checkActivity(joinedActivitiesList, false); joinedActivitiesList = rules()->checkActivity(joinedActivitiesList, false);
newActivitiesList = joinedActivitiesList.split(',', QString::SkipEmptyParts); newActivitiesList = joinedActivitiesList.split(',', QString::SkipEmptyParts);
if (newActivitiesList.contains(NULL_UUID))
newActivitiesList.clear(); // turn into "all"
QStringList allActivities = workspace()->activityList(); QStringList allActivities = workspace()->activityList();
if ( newActivitiesList.isEmpty() || if ( newActivitiesList.isEmpty() ||
(newActivitiesList.count() > 1 && newActivitiesList.count() == allActivities.count()) || (newActivitiesList.count() > 1 && newActivitiesList.count() == allActivities.count()) ||
@ -2380,6 +2384,12 @@ void Client::checkActivities()
} }
newActivitiesList = QString(prop).split(','); newActivitiesList = QString(prop).split(',');
if (newActivitiesList.contains(NULL_UUID)) {
setOnAllActivities(true);
return;
}
if (newActivitiesList == activityList) if (newActivitiesList == activityList)
return; //expected change, it's ok. return; //expected change, it's ok.