summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch')
-rw-r--r--kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch b/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch
new file mode 100644
index 000000000000..e41d58bbe693
--- /dev/null
+++ b/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch
@@ -0,0 +1,21 @@
+diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp
+index 6490145..2403b45 100644
+--- a/ksmserver/screenlocker/ksldapp.cpp
++++ b/ksmserver/screenlocker/ksldapp.cpp
+@@ -286,16 +286,11 @@ void KSldApp::lockProcessReady()
+
+ bool KSldApp::startLockProcess(bool immediateLock)
+ {
+- if (m_plasmaEnabled) {
+- m_lockProcess->start(KStandardDirs::findExe(QLatin1String("plasma-overlay")),
+- QStringList() << QLatin1String("--nofork"));
+- } else {
+ QStringList args;
+ if (immediateLock) {
+ args << "--immediateLock";
+ }
+ m_lockProcess->start(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet")), args);
+- }
+ // we wait one minute
+ if (!m_lockProcess->waitForStarted(60000)) {
+ m_lockProcess->kill();