summaryrefslogtreecommitdiffstats
path: root/kdesktop/lockeng.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-04-23 14:59:01 -0500
committerTimothy Pearson <[email protected]>2012-04-23 14:59:01 -0500
commit67a3a8f34892a6491ba0073a3f583503b44e58e7 (patch)
tree7f3c81b5f0c6b65e0e00711831211c1475af9241 /kdesktop/lockeng.h
parente72f4926c094b2bd94501518fbcd2a3e66a74f6a (diff)
downloadtdebase-67a3a8f34892a6491ba0073a3f583503b44e58e7.tar.gz
tdebase-67a3a8f34892a6491ba0073a3f583503b44e58e7.zip
Fix desktop lock failure due to race condition within signal handler between qt and xcb
Diffstat (limited to 'kdesktop/lockeng.h')
-rw-r--r--kdesktop/lockeng.h3
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();