diff options
| author | Timothy Pearson <[email protected]> | 2015-04-08 15:13:08 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2015-04-14 02:27:23 +0200 |
| commit | d9fe0f0bf3ffa245e094e9d86da3b92a33d27bb9 (patch) | |
| tree | 20979d92829808e36d5ff17557a301a8f2486da7 /kdesktop/desktop.h | |
| parent | 15e069f3e078dd97e7cc99a66b77b2647a82c53d (diff) | |
| download | tdebase-d9fe0f0bf3ffa245e094e9d86da3b92a33d27bb9.tar.gz tdebase-d9fe0f0bf3ffa245e094e9d86da3b92a33d27bb9.zip | |
Remove external dcop call and associated thread
Fix lockup on lock screen command due to signal race condition
(cherry picked from commit e80c2baea0319decdad80c3c98cc7b28a010b0f0)
Diffstat (limited to 'kdesktop/desktop.h')
| -rw-r--r-- | kdesktop/desktop.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h index 6d8015f31..c6a208f07 100644 --- a/kdesktop/desktop.h +++ b/kdesktop/desktop.h @@ -40,6 +40,7 @@ class StartupId; class KDIconView; class Minicli; class TDEActionCollection; +class SaverEngine; class KRootWidget : public TQObject { @@ -68,7 +69,7 @@ public: enum WheelDirection { Forward = 0, Reverse }; - KDesktop(bool x_root_hack, bool wait_for_kded ); + KDesktop(SaverEngine*, bool x_root_hack, bool wait_for_kded ); ~KDesktop(); // Implementation of the DCOP interface @@ -196,6 +197,8 @@ private: KDIconView *m_pIconView; KRootWidget *m_pRootWidget; + SaverEngine *m_pSaver; + Minicli *m_miniCli; StartupId* startup_id; |