From f94af7a1fe657995015acec33f962815af4580f4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 6 Aug 2013 09:26:58 -0500
Subject: Hide logout status dialog during Phase1 client interaction This
 relates to Bug 760

---
 ksmserver/shutdown.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index c519d8b88..8af8f0450 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -477,6 +477,7 @@ void KSMServer::updateLogoutStatusDialog()
         }
         if (inPhase2) {
             if (phase2ClientCount > 0) {
+                static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->show();
                 static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setNotificationActionButtonsSkipText(i18n("Skip Notification (%1)").arg(((KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT - (protectionTimerCounter*1000))/1000)+1));
                 if (nextClientToKill == "") {
                     static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Notifying remaining applications of logout request (%1/%2)...").arg(phase2ClientCount-waitingClients).arg(phase2ClientCount));
@@ -488,6 +489,7 @@ void KSMServer::updateLogoutStatusDialog()
         }
         else {
             if (pendingInteraction) {
+                static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->hide();
                 static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setNotificationActionButtonsSkipText(i18n("Ignore and Resume Logout"));
                 if (nextClientToKill == "") {
                     static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("An application is requesting attention, logout paused..."));
@@ -497,6 +499,7 @@ void KSMServer::updateLogoutStatusDialog()
                 }
             }
             else {
+                static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->show();
                 static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setNotificationActionButtonsSkipText(i18n("Skip Notification (%1)").arg(((KSMSERVER_SHUTDOWN_CLIENT_UNRESPONSIVE_TIMEOUT - (protectionTimerCounter*1000))/1000)+1));
                 if (nextClientToKill == "") {
                     static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Notifying applications of logout request (%1/%2)...").arg(clients.count()-waitingClients).arg(clients.count()));
-- 
cgit v1.2.3