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

restore legacy session after notifying ksplash that we are up and running

Browse source 
svn path=/trunk/kdebase/kwin/; revision=149562
This commit is contained in:
Matthias Ettrich 2002-04-15 13:06:01 +00:00
parent 46f2f4803b
commit a99e99eacc
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
main.cpp
View file

@ -125,12 +125,15 @@ Application::Application( )
atoms = new Atoms; atoms = new Atoms;
// create workspace. // create workspace.
(void) new Workspace( isSessionRestored() ); Workspace* ws = new Workspace( isSessionRestored() );
syncX(); // trigger possible errors, there's still a chance to abort syncX(); // trigger possible errors, there's still a chance to abort
initting = FALSE; // startup done, we are up and running now. initting = FALSE; // startup done, we are up and running now.
dcopClient()->send( "ksplash", "", "upAndRunning(QString)", QString("wm started")); dcopClient()->send( "ksplash", "", "upAndRunning(QString)", QString("wm started"));
if ( isSessionRestored() )
ws->restoreLegacySession( kapp->sessionConfig() );
} }

5
workspace.cpp
View file

@ -336,9 +336,6 @@ Workspace::Workspace( bool restore )
popupinfo = new PopupInfo( ); popupinfo = new PopupInfo( );
init(); init();
if ( restore )
restoreLegacySession(kapp->sessionConfig());
} }
@ -480,7 +477,7 @@ Workspace::~Workspace()
*/ */
bool Workspace::workspaceEvent( XEvent * e ) 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; mouse_emulation = FALSE;
XUngrabKeyboard( qt_xdisplay(), qt_x_time ); XUngrabKeyboard( qt_xdisplay(), qt_x_time );
} }