From f5f0024b74d1bb0eb94937f3dc175d2b682617c2 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 9 Sep 2011 02:03:42 +0000
Subject: Add new _KDE_WM_MODAL_SYS_NOTIFICATION atom to disable
 menu/close/on-all-desktops buttons Improve the appearance of the TDE logout
 sequence using the new atom

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1252231 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 ksmserver/shutdown.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'ksmserver/shutdown.cpp')

diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 549fd2cc3..a153b2806 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -188,7 +188,7 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
 
         if (showFancyLogout) {
             KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
-            KSMShutdownIPDlg::showShutdownIP();
+            shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
         }
 
         if ( saveSession )
@@ -553,6 +553,10 @@ void KSMServer::killWM()
 {
     state = KillingWM;
     bool iswm = false;
+    if (shutdownNotifierIPDlg) {
+        shutdownNotifierIPDlg->close();
+        shutdownNotifierIPDlg=0;
+    }
     for ( KSMClient* c = clients.first(); c; c = clients.next() ) {
         if( isWM( c )) {
             iswm = true;
-- 
cgit v1.2.3