Fix twin deleting comptontdepidfile when compton-tde already running on startup

Fix long-standing bug in calling desktop lock methods over DCOP from within kdesktop process

1 files changed, 23 insertions, 0 deletions

diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h
index dabe5ac23..eb6bd9f55 100644
--- a/kdesktop/krootwm.h
+++ b/kdesktop/krootwm.h
@@ -56,6 +56,9 @@ enum {
   ITEM_LOGOUT
 };
 
+class TQEventLoopThread;
+class KRootWmThreadHelperObject;
+
 /**
  * This class is the handler for the menus (root popup menu and desktop menubar)
  */
@@ -123,6 +126,12 @@ public slots:
   void slotOpenTerminal();
   void slotLockNNewSession();
 
+signals:
+  void terminateHelperThread();
+  void asyncLock();
+  void asyncLockAndDoNewSession();
+  void asyncSlotSessionActivated(int vt);
+
 private:
   KDesktop* m_pDesktop;
 
@@ -166,6 +175,9 @@ private:
 
   static KRootWm * s_rootWm;
 
+  TQEventLoopThread* m_helperThread;
+  KRootWmThreadHelperObject* m_threadHelperObject;
+
 
 private slots:
 
@@ -175,4 +187,15 @@ private slots:
   void slotConfigClosed();
 };
 
+class KRootWmThreadHelperObject : public TQObject
+{
+	TQ_OBJECT
+
+	public slots:
+		void terminateThread();
+		void slotLock();
+		void lockAndDoNewSession();
+		void slotSessionActivated(int vt);
+};
+
 #endif