summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-08 04:31:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-08 04:31:31 +0000
commit2b7f7b5e4cd685f07c849880515f8c828eae1a34 (patch)
tree38b9a213e60d2020fb2f51dd297f38b7a66c61f6
parentbbd15b6d4cc5ee304eaf09449069c7c7c9cfbbbe (diff)
downloadtdebase-2b7f7b5e4cd685f07c849880515f8c828eae1a34.tar.gz
tdebase-2b7f7b5e4cd685f07c849880515f8c828eae1a34.zip
Fix failure to resume from suspend/hibernate or simply clicking the Cancel button on the shutdown screen...
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1257818 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--ksmserver/shutdown.cpp5
-rw-r--r--ksmserver/shutdowndlg.cpp3
2 files changed, 7 insertions, 1 deletions
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 4473c670b..a4ca020e6 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -251,6 +251,11 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm,
if ( clients.isEmpty() )
completeShutdownOrCheckpoint();
}
+ else {
+ if (showFancyLogout) {
+ KSMShutdownIPFeedback::stop();
+ }
+ }
dialogActive = false;
}
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 1ca240738..b613c1369 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -516,7 +516,8 @@ void KSMShutdownFeedback::slotPaintEffect()
KSMShutdownIPFeedback * KSMShutdownIPFeedback::s_pSelf = 0L;
KSMShutdownIPFeedback::KSMShutdownIPFeedback()
- : TQWidget( 0L, "feedbackipwidget", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
+// : TQWidget( 0L, "feedbackipwidget", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
+ : TQWidget( 0L, "feedbackipwidget", Qt::WStyle_Customize | Qt::WStyle_Dialog | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
{
m_sharedRootPixmap = new KRootPixmap(this);