1 files changed, 15 insertions, 9 deletions
diff --git a/src/traylabelmgr.h b/src/traylabelmgr.h
index 8a27a6c..90ff1ba 100644
--- a/src/traylabelmgr.h
+++ b/src/traylabelmgr.h
@@ -1,6 +1,6 @@
 /* 
  *  Copyright (C) 2004 Girish Ramakrishnan All Rights Reserved.
- *	
+ *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -25,12 +25,16 @@
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
+#include <tqtimer.h>
+#include <tdeapplication.h>
 
 #include "customtraylabel.h"
 
 class CustomTrayLabel;
+class TDECmdLineArgs;
+class TQSessionManager;
 
-class TrayLabelMgr : public TQObject
+class TrayLabelMgr : public TQObject, public KSessionManaged
 {
   Q_OBJECT
 
@@ -40,21 +44,21 @@ public:
 
   ~TrayLabelMgr();
 
-  TQString saveSession();
+  bool saveState(TQSessionManager &sm);
 
   bool x11EventFilter(XEvent *);
-  bool processCommand(const TQStringList& argv);
+  bool processCommand(const TQStringList &argv);
   int  hiddenLabelsCount(void) const;
   int  dockedLabelsCount(void) const;
   bool isWindowDocked(Window w);
- 
+
 public slots:
-  void about();
   void undockAll();
   void dockAnother();
 
 private slots:
   void startup();
+  void doRestoreSession();
   void trayLabelDestroyed(TQObject *);
   void sysTrayDestroyed(void);
   void notifySysTrayAbsence();
@@ -62,17 +66,19 @@ private slots:
 private:
   TrayLabelMgr();
   bool processCommand(int argc, char** argv);
+  bool processCommand(TDECmdLineArgs *args);
   void manageTrayLabel(TQTrayLabel *l);
-  bool restoreSession(const TQString& sessionId);
-  
+  void restoreSession();
+
   TQTrayLabel *dockApplication(char *argv[]);
   TQTrayLabel *selectAndDock(Window w = None, bool checkNormality = true);
 
   TQPtrList<TQTrayLabel> mTrayLabels;
   TQValueList<TQStringList> mRequestQ;
+  TQTimer restoreSessionTimer;
   bool mReady;
   int mHiddenLabelsCount;
-  
+
   static const char *mOptionString;
   static TrayLabelMgr *gTrayLabelMgr;
 };