Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 657f520c authored by David Edmundson's avatar David Edmundson

[startkde] Rename method startKSMServer to reflect real behaviour

Summary:
Since ksmserver was split, start-plasma launches plasma-session which in
turn invokes ksmserver.

Test Plan: No code changes, only a method rename

Reviewers: #plasma, broulik, apol

Reviewed By: #plasma, broulik, apol

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D27621
parent c673a832
......@@ -56,7 +56,7 @@ int main(int /*argc*/, char** /*argv*/)
return 2;
}
if (!startKSMServer(true))
if (!startPlasmaSession(true))
return 4;
// Anything after here is logout
......
......@@ -99,7 +99,7 @@ int main(int /*argc*/, char** /*argv*/)
return 1;
}
if (!startKSMServer(false))
if (!startPlasmaSession(false))
return 1;
// Anything after here is logout
......
......@@ -327,7 +327,7 @@ void setupGSLib()
}
}
bool startKSMServer(bool wayland)
bool startPlasmaSession(bool wayland)
{
OrgKdeKSplashInterface iface(QStringLiteral("org.kde.KSplash"), QStringLiteral("/KSplash"), QDBusConnection::sessionBus());
iface.setStage(QStringLiteral("kinit"));
......@@ -345,19 +345,19 @@ bool startKSMServer(bool wayland)
// lock now and do the rest of the KDE startup underneath the locker.
QStringList ksmserverOptions;
QStringList plasmaSessionOptions;
if (wayland) {
ksmserverOptions << QStringLiteral("--no-lockscreen");
plasmaSessionOptions << QStringLiteral("--no-lockscreen");
} else {
if (qEnvironmentVariableIsSet("KDEWM")) {
ksmserverOptions << QStringLiteral("--windowmanager") << qEnvironmentVariable("KDEWM");
plasmaSessionOptions << QStringLiteral("--windowmanager") << qEnvironmentVariable("KDEWM");
}
if (desktopLockedAtStart) {
ksmserverOptions << QStringLiteral("--lockscreen");
plasmaSessionOptions << QStringLiteral("--lockscreen");
}
}
const auto exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/plasma_session"), ksmserverOptions);
const auto exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/plasma_session"), plasmaSessionOptions);
if (exitCode == 255) {
// Startup error
......
......@@ -45,7 +45,7 @@ void setupGSLib();
void setupX11();
bool startKDEInit();
bool startKSMServer(bool wayland);
bool startPlasmaSession(bool wayland);
void waitForKonqi();
......
Markdown is supported
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