Changeset View
Changeset View
Standalone View
Standalone View
client.cpp
Show First 20 Lines • Show All 1339 Lines • ▼ Show 20 Line(s) | 1338 | if (// If we got the request to be on all activities explicitly | |||
---|---|---|---|---|---|
1340 | // If we got a list of activities that covers all activities | 1340 | // If we got a list of activities that covers all activities | ||
1341 | (newActivitiesList.count() > 1 && newActivitiesList.count() == allActivities.count())) { | 1341 | (newActivitiesList.count() > 1 && newActivitiesList.count() == allActivities.count())) { | ||
1342 | 1342 | | |||
1343 | activityList.clear(); | 1343 | activityList.clear(); | ||
1344 | const QByteArray nullUuid = Activities::nullUuid().toUtf8(); | 1344 | const QByteArray nullUuid = Activities::nullUuid().toUtf8(); | ||
1345 | m_client.changeProperty(atoms->activities, XCB_ATOM_STRING, 8, nullUuid.length(), nullUuid.constData()); | 1345 | m_client.changeProperty(atoms->activities, XCB_ATOM_STRING, 8, nullUuid.length(), nullUuid.constData()); | ||
1346 | 1346 | | |||
1347 | } else { | 1347 | } else { | ||
1348 | QByteArray joined = joinedActivitiesList.toAscii(); | 1348 | QByteArray joined = joinedActivitiesList.toLatin1(); | ||
1349 | activityList = newActivitiesList; | 1349 | activityList = newActivitiesList; | ||
1350 | m_client.changeProperty(atoms->activities, XCB_ATOM_STRING, 8, joined.length(), joined.constData()); | 1350 | m_client.changeProperty(atoms->activities, XCB_ATOM_STRING, 8, joined.length(), joined.constData()); | ||
1351 | } | 1351 | } | ||
1352 | 1352 | | |||
1353 | updateActivities(false); | 1353 | updateActivities(false); | ||
1354 | #else | 1354 | #else | ||
1355 | Q_UNUSED(newActivitiesList) | 1355 | Q_UNUSED(newActivitiesList) | ||
1356 | #endif | 1356 | #endif | ||
▲ Show 20 Lines • Show All 818 Lines • Show Last 20 Lines |