summaryrefslogtreecommitdiffstats
path: root/kdesktop/lockeng.cc
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2013-03-09 17:18:55 +0100
committerSlávek Banko <[email protected]>2013-03-09 17:18:55 +0100
commit0dd840ea93b773e0ae509a5c10602023364164fd (patch)
tree4564b549861a44cddd8b8cd524fd97c31888f10f /kdesktop/lockeng.cc
parent34dfb0d71247da5d2865af9d115ecc67801fdee5 (diff)
downloadtdebase-0dd840ea93b773e0ae509a5c10602023364164fd.tar.gz
tdebase-0dd840ea93b773e0ae509a5c10602023364164fd.zip
Fix unintended rename of SAKProcess*
Diffstat (limited to 'kdesktop/lockeng.cc')
-rw-r--r--kdesktop/lockeng.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index a8c98cf35..4f13dfa14 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -54,7 +54,7 @@ SaverEngine::SaverEngine()
: TQWidget(),
KScreensaverIface(),
mBlankOnly(false),
- mSATDEProcess(NULL),
+ mSAKProcess(NULL),
mTerminationRequested(false)
{
struct sigaction act;
@@ -86,9 +86,9 @@ SaverEngine::SaverEngine()
connect(&mLockProcess, TQT_SIGNAL(processExited(TDEProcess *)),
TQT_SLOT(lockProcessExited()));
- mSATDEProcess = new TDEProcess;
- *mSATDEProcess << "tdmtsak";
- connect(mSATDEProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSATDEProcessExited()));
+ mSAKProcess = new TDEProcess;
+ *mSAKProcess << "tdmtsak";
+ connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
@@ -134,7 +134,7 @@ void SaverEngine::lock()
bool ok = true;
if (mState != Saving)
{
- mSATDEProcess->kill(SIGTERM);
+ mSAKProcess->kill(SIGTERM);
ok = startLockProcess( ForceLock );
// It takes a while for kdesktop_lock to start and lock the screen.
// Therefore delay the DCOP call until it tells kdesktop that the locking is in effect.
@@ -179,7 +179,7 @@ void SaverEngine::save()
{
if (mState == Waiting)
{
- mSATDEProcess->kill(SIGTERM);
+ mSAKProcess->kill(SIGTERM);
startLockProcess( DefaultLock );
}
}
@@ -276,18 +276,18 @@ void SaverEngine::enableExports()
void SaverEngine::handleSecureDialog()
{
// Wait for SAK press
- if (!mSATDEProcess->isRunning()) mSATDEProcess->start();
+ if (!mSAKProcess->isRunning()) mSAKProcess->start();
}
-void SaverEngine::slotSATDEProcessExited()
+void SaverEngine::slotSAKProcessExited()
{
- int retcode = mSATDEProcess->exitStatus();
- if ((retcode != 0) && (mSATDEProcess->normalExit())) {
+ int retcode = mSAKProcess->exitStatus();
+ if ((retcode != 0) && (mSAKProcess->normalExit())) {
trinity_lockeng_sak_available = FALSE;
printf("[kdesktop] SAK driven secure dialog is not available for use (retcode %d). Check tdmtsak for proper functionality.\n", retcode); fflush(stdout);
}
- if ((mSATDEProcess->normalExit()) && (trinity_lockeng_sak_available == TRUE)) {
+ if ((mSAKProcess->normalExit()) && (trinity_lockeng_sak_available == TRUE)) {
bool ok = true;
if (mState == Waiting)
{
@@ -525,7 +525,7 @@ void SaverEngine::idleTimeout()
// disable X screensaver
XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset );
XSetScreenSaver(tqt_xdisplay(), 0, mXInterval, PreferBlanking, DontAllowExposures);
- mSATDEProcess->kill(SIGTERM);
+ mSAKProcess->kill(SIGTERM);
startLockProcess( DefaultLock );
}