* Massive import of OpenSUSE patches, primarily for bugfixes

* Added some infrastructure created by OpenSUSE to allow for future addition of the Kickoff menu as an option
* Minor Slackware compilation fixes


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1171255 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 0 deletions

diff --git a/ksmserver/server.h b/ksmserver/server.h
index 3d5904e53..0fc900042 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -85,6 +85,7 @@ public:
     // public API
     void restoreSession( TQString sessionName );
     void startDefaultSession();
+
     void shutdown( KApplication::ShutdownConfirm confirm,
                    KApplication::ShutdownType sdtype,
                    KApplication::ShutdownMode sdmode );
@@ -92,6 +93,11 @@ public:
     virtual void suspendStartup( TQCString app );
     virtual void resumeStartup( TQCString app );
 
+    bool checkStatus( bool &logoutConfirmed, bool &maysd, 
+		      KApplication::ShutdownConfirm confirm,
+		      KApplication::ShutdownType sdtype,
+		      KApplication::ShutdownMode sdmode );
+
 public slots:
     void cleanUp();
 
@@ -142,6 +148,11 @@ private:
     bool defaultSession() const; // empty session
     void setupXIOErrorHandler();
 
+    void shutdownInternal( KApplication::ShutdownConfirm confirm,
+			   KApplication::ShutdownType sdtype,
+			   KApplication::ShutdownMode sdmode,
+			   TQString bootOption = TQString::null );
+
     void performLegacySessionSave();
     void storeLegacySession( KConfig* config );
     void restoreLegacySession( KConfig* config );
@@ -157,6 +168,7 @@ private:
 
     // public dcop interface
     void logout( int, int, int );
+    virtual void logoutTimed( int, int, TQString );
     TQStringList sessionList();
     TQString currentSession();
     void saveCurrentSession();