restore legacy session after notifying ksplash that we are up and running
svn path=/trunk/kdebase/kwin/; revision=149562
This commit is contained in:
parent
46f2f4803b
commit
a99e99eacc
2 changed files with 5 additions and 5 deletions
5
main.cpp
5
main.cpp
|
@ -125,12 +125,15 @@ Application::Application( )
|
|||
atoms = new Atoms;
|
||||
|
||||
// create workspace.
|
||||
(void) new Workspace( isSessionRestored() );
|
||||
Workspace* ws = new Workspace( isSessionRestored() );
|
||||
|
||||
syncX(); // trigger possible errors, there's still a chance to abort
|
||||
|
||||
initting = FALSE; // startup done, we are up and running now.
|
||||
dcopClient()->send( "ksplash", "", "upAndRunning(QString)", QString("wm started"));
|
||||
|
||||
if ( isSessionRestored() )
|
||||
ws->restoreLegacySession( kapp->sessionConfig() );
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -336,9 +336,6 @@ Workspace::Workspace( bool restore )
|
|||
popupinfo = new PopupInfo( );
|
||||
|
||||
init();
|
||||
|
||||
if ( restore )
|
||||
restoreLegacySession(kapp->sessionConfig());
|
||||
}
|
||||
|
||||
|
||||
|
@ -480,7 +477,7 @@ Workspace::~Workspace()
|
|||
*/
|
||||
bool Workspace::workspaceEvent( XEvent * e )
|
||||
{
|
||||
if ( mouse_emulation && (e->type == ButtonPress || e->type == ButtonRelease) ) {
|
||||
if ( mouse_emulation && (e->type == ButtonPress || e->type == ButtonRelease ) ) {
|
||||
mouse_emulation = FALSE;
|
||||
XUngrabKeyboard( qt_xdisplay(), qt_x_time );
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue