summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-25 13:05:22 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-25 13:05:22 -0500
commitc060a817e492351d3097b9d84f80c9b17690342a (patch)
tree8bfa01e350583f48e17197137052fc378faaa377
parent5305e40a0ab46ca2e0e05ea8667ab73541207e07 (diff)
downloadtdebase-c060a817e492351d3097b9d84f80c9b17690342a.tar.gz
tdebase-c060a817e492351d3097b9d84f80c9b17690342a.zip
Do not show logout status dialog if the user has turned it off in their configuration
-rw-r--r--ksmserver/shutdown.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 41556dcf2..d09383fcd 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -257,10 +257,12 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
shutdownMode = sdmode;
bootOption = bopt;
shutdownNotifierIPDlg = 0;
- shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
- if (shutdownNotifierIPDlg) {
- static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Notifying applications of logout request..."));
- notificationTimer.start( KSMSERVER_NOTIFICATION_MANUAL_OPTIONS_TIMEOUT, true );
+ if (showLogoutStatusDlg) {
+ shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
+ if (shutdownNotifierIPDlg) {
+ static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Notifying applications of logout request..."));
+ notificationTimer.start( KSMSERVER_NOTIFICATION_MANUAL_OPTIONS_TIMEOUT, true );
+ }
}
// shall we save the session on logout?