Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/ksmserver/files: ksmserver-4.10.1-noplasmalock.patch
Date: Tue, 26 Mar 2013 22:09:28
Message-Id: 20130326220924.07E8B2171D@flycatcher.gentoo.org
1 dilfridge 13/03/26 22:09:23
2
3 Added: ksmserver-4.10.1-noplasmalock.patch
4 Log:
5 Hard-disable plasma screen locker, bug 462152
6
7 (Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
8
9 Revision Changes Path
10 1.1 kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/ksmserver/files/ksmserver-4.10.1-noplasmalock.patch?rev=1.1&content-type=text/plain
14
15 Index: ksmserver-4.10.1-noplasmalock.patch
16 ===================================================================
17 diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp
18 index 22755ea..9e43c36 100644
19 --- a/ksmserver/screenlocker/ksldapp.cpp
20 +++ b/ksmserver/screenlocker/ksldapp.cpp
21 @@ -271,12 +271,12 @@ void KSldApp::lockProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
22
23 bool KSldApp::startLockProcess()
24 {
25 - if (m_plasmaEnabled) {
26 - m_lockProcess->setProgram(KStandardDirs::findExe(QLatin1String("plasma-overlay")));
27 - *m_lockProcess << QLatin1String("--nofork");
28 - } else {
29 +// if (m_plasmaEnabled) {
30 +// m_lockProcess->setProgram(KStandardDirs::findExe(QLatin1String("plasma-overlay")));
31 +// *m_lockProcess << QLatin1String("--nofork");
32 +// } else {
33 m_lockProcess->setProgram(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet")));
34 - }
35 +// }
36 m_lockProcess->start();
37 // we wait one minute
38 if (!m_lockProcess->waitForStarted()) {