Remove external dcop call and associated thread

Fix lockup on lock screen command due to signal race condition
(cherry picked from commit e80c2baea0319decdad80c3c98cc7b28a010b0f0)

1 files changed, 3 insertions, 24 deletions

diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h
index 0e27001b2..8fb5af8b9 100644
--- a/kdesktop/krootwm.h
+++ b/kdesktop/krootwm.h
@@ -33,6 +33,7 @@ typedef XID Window;
 
 class KMenuBar;
 class KDesktop;
+class SaverEngine;
 class TQPopupMenu;
 class KCMultiDialog;
 class KNewMenu;
@@ -66,7 +67,7 @@ class KRootWm: public TQObject {
   Q_OBJECT
 
 public:
-  KRootWm(KDesktop*);
+  KRootWm(SaverEngine*, KDesktop*);
   ~KRootWm();
 
   bool startup;
@@ -126,14 +127,8 @@ public slots:
   void slotOpenTerminal();
   void slotLockNNewSession();
 
-signals:
-  void initializeHelperThread();
-  void terminateHelperThread();
-  void asyncLock();
-  void asyncLockAndDoNewSession();
-  void asyncSlotSessionActivated(int vt);
-
 private:
+  SaverEngine* m_pSaver;
   KDesktop* m_pDesktop;
 
   // The five root menus :
@@ -176,10 +171,6 @@ private:
 
   static KRootWm * s_rootWm;
 
-  TQEventLoopThread* m_helperThread;
-  KRootWmThreadHelperObject* m_threadHelperObject;
-
-
 private slots:
 
   void slotMenuItemActivated(int);
@@ -188,16 +179,4 @@ private slots:
   void slotConfigClosed();
 };
 
-class KRootWmThreadHelperObject : public TQObject
-{
-	TQ_OBJECT
-
-	public slots:
-		void initializeThread();
-		void terminateThread();
-		void slotLock();
-		void lockAndDoNewSession();
-		void slotSessionActivated(int vt);
-};
-
 #endif