From a99e99eacc7c66c7f2341ebabf5b7226115b713b Mon Sep 17 00:00:00 2001 From: Matthias Ettrich Date: Mon, 15 Apr 2002 13:06:01 +0000 Subject: [PATCH] restore legacy session after notifying ksplash that we are up and running svn path=/trunk/kdebase/kwin/; revision=149562 --- main.cpp | 5 ++++- workspace.cpp | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main.cpp b/main.cpp index 991813ea88..bca4d7c6f6 100644 --- a/main.cpp +++ b/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() ); } diff --git a/workspace.cpp b/workspace.cpp index 4e768c4188..a4150531a2 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -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 ); }