Disable legacy session support in HEAD KWin too, as ksmserver is not

branched.

svn path=/trunk/kdebase/kwin/; revision=203113

main.cpp

@@ -140,8 +140,12 @@ Application::Application( )
     initting = FALSE; // startup done, we are up and running now.
     dcopClient()->send( "ksplash", "", "upAndRunning(QString)", QString("wm started"));
     
+#ifndef NO_LEGACY_SESSION_MANAGEMENT
     if ( isSessionRestored() )
 	ws->restoreLegacySession( kapp->sessionConfig() );
+#else
+    ws = ws; // shut up
+#endif
 }
 
 

workspace.cpp

@@ -3713,7 +3713,6 @@ void Workspace::storeLegacySession( KConfig* config )
     // All events should be there because of the XSync above.
     kapp->processEvents(10);
 }
-#endif
 
 /*!
   Restores legacy session management data (i.e. restart applications)
@@ -3737,6 +3736,7 @@ void Workspace::restoreLegacySession( KConfig* config )
         }
     }
 }
+#endif
 
 /*!
   Stores the current session in the config file
@@ -3755,12 +3755,12 @@ void Workspace::storeSession( KConfig* config )
         QCString sessionId = c->sessionId();
         QCString wmCommand = c->wmCommand();
         if ( sessionId.isEmpty() )
-#ifndef NO_LEGACY_SESSION_MANAGEMENT
+//#ifndef NO_LEGACY_SESSION_MANAGEMENT // remember also legacy apps anyway
             // This is the only connection between the determination of legacy
             // session managed applications (storeLegacySession) and the
             // recollection of the window geometries (this function).
             if ( wmCommand.isEmpty() )
-#endif
+//#endif
                 continue;
         count++;
         QString n = QString::number(count);

workspace.h

@@ -248,8 +248,11 @@ public:
 
     void performWindowOperation( Client* c, Options::WindowOperation op );
 
+#define NO_LEGACY_SESSION_MANAGEMENT // moved to ksmserver
+#ifndef NO_LEGACY_SESSION_MANAGEMENT
     void restoreLegacySession( KConfig* config );
     void storeLegacySession( KConfig* config );
+#endif
     void storeSession( KConfig* config );
 
     SessionInfo* takeSessionInfo( Client* );