From 226b87a2e4f6d8ce7fd19248decd00bdfab7bd19 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 28 Aug 2011 07:48:28 +0000 Subject: Fix ksmserver crash on logout git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1249866 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksmserver/shutdowndlg.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 810260c2d..e21cbf4a3 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -1098,9 +1098,9 @@ KSMShutdownIPDlg::KSMShutdownIPDlg(TQWidget* parent) // we need to set the minimum size for the window frame->setMinimumWidth(400); vbox->addWidget( frame ); - TQGridLayout* gbox = new TQGridLayout( frame, 1, 1, 2 * KDialog::marginHint(), 2 * KDialog::spacingHint() ); - TQHBoxLayout* centerbox = new TQHBoxLayout( gbox, KDialog::spacingHint() ); - TQHBoxLayout* seperatorbox = new TQHBoxLayout( gbox, 0 ); + TQGridLayout* gbox = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); + TQHBoxLayout* centerbox = new TQHBoxLayout( frame, 0, KDialog::spacingHint() ); + TQHBoxLayout* seperatorbox = new TQHBoxLayout( frame, 0, 0 ); TQWidget* ticon = new TQWidget( frame ); KIconLoader * ldr = KGlobal::iconLoader(); @@ -1157,6 +1157,9 @@ KSMShutdownIPDlg::KSMShutdownIPDlg(TQWidget* parent) setFixedSize( sizeHint() ); setCaption( i18n("Please wait...") ); + + show(); + setActiveWindow(); } KSMShutdownIPDlg::~KSMShutdownIPDlg() -- cgit v1.2.3