diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-23 14:59:01 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:27:09 +0200 |
| commit | 1bd1c6586c658d3aa7195c34eaf009c61ffa7e73 (patch) | |
| tree | b8371a1aa9c5dc9c1b9d4888805216593fcc1208 /kdesktop/lockeng.h | |
| parent | 4a67f231f00d75b9b91e13874d70d5e9fcf9c460 (diff) | |
| download | tdebase-1bd1c6586c658d3aa7195c34eaf009c61ffa7e73.tar.gz tdebase-1bd1c6586c658d3aa7195c34eaf009c61ffa7e73.zip | |
Fix desktop lock failure due to race condition within signal handler between qt and xcb
(cherry picked from commit 67a3a8f34892a6491ba0073a3f583503b44e58e7)
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 ae08e9ad8..e42a048bb 100644 --- a/kdesktop/lockeng.h +++ b/kdesktop/lockeng.h @@ -79,11 +79,12 @@ public: virtual void saverLockReady(); public slots: - void lockProcessWaiting(); + void slotLockProcessWaiting(); protected slots: void idleTimeout(); void lockProcessExited(); + void lockProcessWaiting(); private slots: void handleSecureDialog(); |