summaryrefslogtreecommitdiffstats
path: root/kdm
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-27 23:27:56 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-27 23:27:56 +0000
commit552b36e1c08deafa5eb19fb8a51d03f63b59ca1c (patch)
tree6c77a85a815a1b5d8d73eea22c627b1187cf178b /kdm
parent830032294517ab286b424639fcf65435826d42c3 (diff)
downloadtdebase-552b36e1c08deafa5eb19fb8a51d03f63b59ca1c.tar.gz
tdebase-552b36e1c08deafa5eb19fb8a51d03f63b59ca1c.zip
Fix shutdown dialog failure to appear in themed mode
Fix shutdown dialog appearance when Ubuntu logout is not set git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1255984 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdm')
-rw-r--r--kdm/kfrontend/kdmshutdown.cpp1
-rw-r--r--kdm/kfrontend/kgapp.cpp5
2 files changed, 4 insertions, 2 deletions
diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp
index 692a15a3e..ecd8d5ee8 100644
--- a/kdm/kfrontend/kdmshutdown.cpp
+++ b/kdm/kfrontend/kdmshutdown.cpp
@@ -555,7 +555,6 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
hbox->addWidget( lfrm, AlignCenter );
// we need to set the minimum size for the logout box, since it
// gets too small if there all options are not available
- lfrm->setMinimumSize(300,120);
TQLabel *icon = new TQLabel( lfrm );
icon->setPixmap( TQPixmap( locate( "data", "kdm/pics/shutdown.jpg" ) ) );
TQVBoxLayout *iconlay = new TQVBoxLayout( lfrm );
diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
index ac8bd793c..f0a4e3e6a 100644
--- a/kdm/kfrontend/kgapp.cpp
+++ b/kdm/kfrontend/kgapp.cpp
@@ -357,11 +357,14 @@ kg_main( const char *argv0 )
// This also prevents the user from being dropped to a console login if Xorg glitches or is buggy
XSetErrorHandler( ignoreXError );
KThemedGreeter *tgrt;
- dialog = tgrt = new KThemedGreeter;
+ bool has_kwin_bkp = has_kwin;
is_themed = true;
+ has_kwin = false; // [FIXME] The themed greeter is built on the assumption that there is no window manager available (i.e. it keeps stealing focus) and needs to be repaired.
+ dialog = tgrt = new KThemedGreeter;
kdDebug() << timestamp() << " themed" << endl;
if (!tgrt->isOK()) {
is_themed = false;
+ has_kwin = has_kwin_bkp;
delete tgrt;
checkSAK(app);
dialog = new KStdGreeter;