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

remove clientMachine from session handling

Browse source 
since the hostname is resolved asynchronous, testing it can easily fail

CCBUG: 326893
FIXED-IN: 4.11.6
REVIEW: 114963
This commit is contained in:
Thomas Lübking 2014-01-11 12:52:10 +01:00
parent 5032520920
commit 374ea9091e
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sm.cpp
View file

@ -121,7 +121,6 @@ void Workspace::storeClient(KConfigGroup &cg, int num, Client *c)
cg.writeEntry(QString("sessionId") + n, c->sessionId().constData()); cg.writeEntry(QString("sessionId") + n, c->sessionId().constData());
cg.writeEntry(QString("windowRole") + n, c->windowRole().constData()); cg.writeEntry(QString("windowRole") + n, c->windowRole().constData());
cg.writeEntry(QString("wmCommand") + n, c->wmCommand().constData()); cg.writeEntry(QString("wmCommand") + n, c->wmCommand().constData());
cg.writeEntry(QString("wmClientMachine") + n, c->wmClientMachine(true).constData());
cg.writeEntry(QString("resourceName") + n, c->resourceName().constData()); cg.writeEntry(QString("resourceName") + n, c->resourceName().constData());
cg.writeEntry(QString("resourceClass") + n, c->resourceClass().constData()); cg.writeEntry(QString("resourceClass") + n, c->resourceClass().constData());
cg.writeEntry(QString("geometry") + n, QRect(c->calculateGravitation(true), c->clientSize())); // FRAME cg.writeEntry(QString("geometry") + n, QRect(c->calculateGravitation(true), c->clientSize())); // FRAME
@ -206,7 +205,6 @@ void Workspace::addSessionInfo(KConfigGroup &cg)
info->sessionId = cg.readEntry(QString("sessionId") + n, QString()).toLatin1(); info->sessionId = cg.readEntry(QString("sessionId") + n, QString()).toLatin1();
info->windowRole = cg.readEntry(QString("windowRole") + n, QString()).toLatin1(); info->windowRole = cg.readEntry(QString("windowRole") + n, QString()).toLatin1();
info->wmCommand = cg.readEntry(QString("wmCommand") + n, QString()).toLatin1(); info->wmCommand = cg.readEntry(QString("wmCommand") + n, QString()).toLatin1();
info->wmClientMachine = cg.readEntry(QString("wmClientMachine") + n, QString()).toLatin1();
info->resourceName = cg.readEntry(QString("resourceName") + n, QString()).toLatin1(); info->resourceName = cg.readEntry(QString("resourceName") + n, QString()).toLatin1();
info->resourceClass = cg.readEntry(QString("resourceClass") + n, QString()).toLower().toLatin1(); info->resourceClass = cg.readEntry(QString("resourceClass") + n, QString()).toLower().toLatin1();
info->geometry = cg.readEntry(QString("geometry") + n, QRect()); info->geometry = cg.readEntry(QString("geometry") + n, QRect());
@ -256,7 +254,6 @@ SessionInfo* Workspace::takeSessionInfo(Client* c)
QByteArray sessionId = c->sessionId(); QByteArray sessionId = c->sessionId();
QByteArray windowRole = c->windowRole(); QByteArray windowRole = c->windowRole();
QByteArray wmCommand = c->wmCommand(); QByteArray wmCommand = c->wmCommand();
QByteArray wmClientMachine = c->wmClientMachine(true);
QByteArray resourceName = c->resourceName(); QByteArray resourceName = c->resourceName();
QByteArray resourceClass = c->resourceClass(); QByteArray resourceClass = c->resourceClass();
@ -289,7 +286,6 @@ SessionInfo* Workspace::takeSessionInfo(Client* c)
break; break;
if (info->resourceName == resourceName if (info->resourceName == resourceName
&& info->resourceClass == resourceClass && info->resourceClass == resourceClass
&& info->wmClientMachine == wmClientMachine
&& sessionInfoWindowTypeMatch(c, info)) { && sessionInfoWindowTypeMatch(c, info)) {
if (wmCommand.isEmpty() || info->wmCommand == wmCommand) { if (wmCommand.isEmpty() || info->wmCommand == wmCommand) {
realInfo = info; realInfo = info;