From f62a335a9aa23c9a10a9768caf5a9c2eae922861 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 27 Aug 2011 23:57:48 +0000 Subject: Move krootbacking executable from kdeartwork to kdebase Reenable HAL media manager Fix system tray with ARGB visuals (again) Beautify logout process git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1249834 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksmserver/shutdown.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'ksmserver/shutdown.cpp') diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index d298b2cf3..549fd2cc3 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -158,6 +158,13 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm, if (sdmode == KApplication::ShutdownModeDefault) sdmode = KApplication::ShutdownModeInteractive; + // shall we show a nice fancy logout screen? + bool showFancyLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFancyLogout", true); + + if (showFancyLogout) { + KSMShutdownIPFeedback::start(); + } + dialogActive = true; if ( !logoutConfirmed ) { KSMShutdownFeedback::start(); // make the screen gray @@ -179,11 +186,8 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm, // shall we save the session on logout? saveSession = ( config->readEntry( "loginMode", "restorePreviousLogout" ) == "restorePreviousLogout" ); - // shall we show a nice fancy logout screen? - bool showFancyLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("showFancyLogout", true); - if (showFancyLogout) { -// KSMShutdownIPFeedback::start(); // hide the UGLY logout process from the user + KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user KSMShutdownIPDlg::showShutdownIP(); } -- cgit v1.2.1