diff options
| author | Timothy Pearson <[email protected]> | 2015-04-08 15:27:25 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2015-04-14 02:27:25 +0200 |
| commit | 0621ed70db1176471ce992b8eeb4d32d90f2f547 (patch) | |
| tree | 619c39131574153080b05877a701bf5f5af2b75c /kdesktop/lockeng.h | |
| parent | 6dd6500446c3cd6e9ac0a4d980f596d8bb67d7d0 (diff) | |
| download | tdebase-0621ed70db1176471ce992b8eeb4d32d90f2f547.tar.gz tdebase-0621ed70db1176471ce992b8eeb4d32d90f2f547.zip | |
Eliminate usleep() loop during kdesktop startup
Do not switch desktops if lock fails to engage
(cherry picked from commit 751c96f9b1fc01675a1a9d34831104f98adfd84f)
Diffstat (limited to 'kdesktop/lockeng.h')
| -rw-r--r-- | kdesktop/lockeng.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h index e7be7a06e..782f779a3 100644 --- a/kdesktop/lockeng.h +++ b/kdesktop/lockeng.h @@ -89,7 +89,7 @@ public: * Called by KDesktop to wait for saver engage * @internal */ - void waitForLockEngage(); + bool waitForLockEngage(); public slots: void slotLockProcessWaiting(); @@ -125,6 +125,7 @@ protected: enum SaverState { Waiting, Preparing, Engaging, Saving }; enum LockType { DontLock, DefaultLock, ForceLock, SecureDialog }; bool startLockProcess( LockType lock_type ); + bool waitForLockProcessStart(); void stopLockProcess(); bool handleKeyPress(XKeyEvent *xke); void processLockTransactions(); |