removed workaround for qt-2.1b3
svn path=/trunk/kdebase/ksmserver/; revision=57371
This commit is contained in:
parent
dea089ee3b
commit
3b707063bf
1 changed files with 4 additions and 8 deletions
12
main.cpp
12
main.cpp
|
@ -167,7 +167,7 @@ void Application::commitData( QSessionManager& /*sm*/ )
|
||||||
void Application::saveState( QSessionManager& sm )
|
void Application::saveState( QSessionManager& sm )
|
||||||
{
|
{
|
||||||
KApplication::saveState( sm );
|
KApplication::saveState( sm );
|
||||||
static bool firstTime = false;
|
static bool firstTime = true;
|
||||||
if ( firstTime ) {
|
if ( firstTime ) {
|
||||||
firstTime = false;
|
firstTime = false;
|
||||||
return; // no need to save this state.
|
return; // no need to save this state.
|
||||||
|
@ -175,15 +175,11 @@ void Application::saveState( QSessionManager& sm )
|
||||||
|
|
||||||
sm.release();
|
sm.release();
|
||||||
|
|
||||||
// we really should do phase 2 here, unfortunately qt-2.1beta3 contains a bug.
|
|
||||||
// #######TODO FIXME with final Qt-2.1
|
|
||||||
/*
|
|
||||||
if ( !sm.isPhase2() ) {
|
if ( !sm.isPhase2() ) {
|
||||||
sm.requestPhase2();
|
sm.requestPhase2();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
|
|
||||||
workspaces.first()->storeSession( kapp->sessionConfig() );
|
workspaces.first()->storeSession( kapp->sessionConfig() );
|
||||||
kapp->sessionConfig()->sync();
|
kapp->sessionConfig()->sync();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue