yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reverting misunderstanding

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=481441
This commit is contained in:
Stephan Kulow 2005-11-19 08:06:46 +00:00
parent 0695439fe1
commit 0c904fde9e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sm.cpp
View file

@ -42,13 +42,13 @@ bool SessionManaged::saveState( QSessionManager& sm )
{
Workspace::self()->sessionSaveStarted();
if( ksmserver ) // save stacking order etc. before "save file?" etc. dialogs change it
Workspace::self()->storeSession( KGlobal::config(), SMSavePhase0 );
Workspace::self()->storeSession( kapp->sessionConfig(), SMSavePhase0 );
sm.release(); // Qt doesn't automatically release in this case (bug?)
sm.requestPhase2();
return true;
}
Workspace::self()->storeSession( KGlobal::config(), ksmserver ? SMSavePhase2 : SMSavePhase2Full );
KGlobal::config()->sync();
Workspace::self()->storeSession( kapp->sessionConfig(), ksmserver ? SMSavePhase2 : SMSavePhase2Full );
kapp->sessionConfig()->sync();
return true;
}
@ -148,7 +148,7 @@ void Workspace::storeSession( KConfig* config, SMSavePhase phase )
void Workspace::loadSessionInfo()
{
session.clear();
KConfig* config = KGlobal::config();
KConfig* config = kapp->sessionConfig();
config->setGroup("Session" );
int count = config->readNumEntry( "count" );
int active_client = config->readNumEntry( "active" );

2
workspace.cpp
View file

@ -316,7 +316,7 @@ void Workspace::init()
initial_desktop = client_info.currentDesktop();
else
{
KConfigGroup group( KGlobal::config() , "Session" );
KConfigGroup group( kapp->sessionConfig(), "Session" );
initial_desktop = group.readNumEntry( "desktop", 1 );
}
if( !setCurrentDesktop( initial_desktop ))