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 b65246dcef
commit 60a62b2a1a
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client.cpp
View file

@ -1519,7 +1519,10 @@ void Client::setOnActivity(const QString &activity, bool enable)
/**
* set exactly which activities this client is on
*/
<<<<<<< HEAD
// cloned from kactivities/src/lib/core/consumer.cpp
=======
>>>>>>> Map NULL_UUID activity to ALL activities
#define NULL_UUID "00000000-0000-0000-0000-000000000000"
void Client::setOnActivities(QStringList newActivitiesList)
{
@ -2384,6 +2387,7 @@ void Client::checkActivities()
}
newActivitiesList = QString(prop).split(',');
if (newActivitiesList == activityList)
return; //expected change, it's ok.