logout.cpp   logout.cpp 
skipping to change at line 349 skipping to change at line 349
qCDebug(KSMSERVER) << "Client " << c->program() << " (" << c->clien tId() << ") canceled shutdown."; qCDebug(KSMSERVER) << "Client " << c->program() << " (" << c->clien tId() << ") canceled shutdown.";
KNotification::event(QStringLiteral("cancellogout"), i18n("Logout c anceled by '%1'", c->program()), QPixmap(), nullptr, KNotification::Default Event); KNotification::event(QStringLiteral("cancellogout"), i18n("Logout c anceled by '%1'", c->program()), QPixmap(), nullptr, KNotification::Default Event);
foreach (KSMClient *c, clients) { foreach (KSMClient *c, clients) {
SmsShutdownCancelled(c->connection()); SmsShutdownCancelled(c->connection());
if (c->saveYourselfDone) { if (c->saveYourselfDone) {
// Discard also saved state. // Discard also saved state.
QStringList discard = c->discardCommand(); QStringList discard = c->discardCommand();
if (!discard.isEmpty()) if (!discard.isEmpty())
executeCommand(discard); executeCommand(discard);
} }
c->resetState();
} }
} }
state = Idle; state = Idle;
m_kwinInterface->setState(KWinSessionState::Normal); m_kwinInterface->setState(KWinSessionState::Normal);
Q_EMIT logoutFinished(false); Q_EMIT logoutFinished(false);
} }
void KSMServer::startProtection() void KSMServer::startProtection()
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/