Commit 8b1d83ff authored by David Edmundson's avatar David Edmundson
Browse files

[ksmserver] Rename restoreSession(QString)

It doesn't actually restore a session merely queues up which session
ksmserver should be using when restoreSession is externally invoked.
parent a22ff36e
Pipeline #194096 passed with stage
in 11 minutes and 25 seconds
......@@ -294,11 +294,11 @@ int main(int argc, char *argv[])
QString loginMode = config.readEntry("loginMode", "restorePreviousLogout");
if (parser.isSet(restoreOption))
server->restoreSession(QStringLiteral(SESSION_BY_USER));
server->setRestoreSession(QStringLiteral(SESSION_BY_USER));
else if (loginMode == QLatin1String("restorePreviousLogout"))
server->restoreSession(QStringLiteral(SESSION_PREVIOUS_LOGOUT));
server->setRestoreSession(QStringLiteral(SESSION_PREVIOUS_LOGOUT));
else if (loginMode == QLatin1String("restoreSavedSession"))
server->restoreSession(QStringLiteral(SESSION_BY_USER));
server->setRestoreSession(QStringLiteral(SESSION_BY_USER));
else
server->startDefaultSession();
......
......@@ -894,9 +894,7 @@ void KSMServer::setupShortcuts()
}
}
/*! Restores the previous session.
*/
void KSMServer::restoreSession(const QString &sessionName)
void KSMServer::setRestoreSession(const QString &sessionName)
{
if (state != Idle)
return;
......
......@@ -98,7 +98,7 @@ public:
// public API
void performLogout();
void restoreSession();
void restoreSession(const QString &sessionName);
void setRestoreSession(const QString &sessionName);
void startDefaultSession();
void shutdown(KWorkSpace::ShutdownConfirm confirm, KWorkSpace::ShutdownType sdtype, KWorkSpace::ShutdownMode sdmode);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment