summaryrefslogtreecommitdiffstats
path: root/kdesktop/desktop.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-04-08 15:13:08 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-04-08 15:13:08 -0500
commite80c2baea0319decdad80c3c98cc7b28a010b0f0 (patch)
treefe2e7a77c80f4d8031646f4256670b91ed53a3d8 /kdesktop/desktop.h
parent755776b6c4875dddd0fa2971845252274215d86a (diff)
downloadtdebase-e80c2bae.tar.gz
tdebase-e80c2bae.zip
Remove external dcop call and associated thread
Fix lockup on lock screen command due to signal race condition
Diffstat (limited to 'kdesktop/desktop.h')
-rw-r--r--kdesktop/desktop.h5
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;