summaryrefslogtreecommitdiffstats
path: root/tdm/kfrontend
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-24 19:21:48 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-24 19:21:48 -0500
commit30617b6fb78c56e76aedd1480429dd4e68da201a (patch)
tree446b6177c509bd2d9414730179a66f862df9a1c3 /tdm/kfrontend
parent073dc86aceaa060597d7653747c3c6c14d0ed59d (diff)
downloadtdebase-30617b6fb78c56e76aedd1480429dd4e68da201a.tar.gz
tdebase-30617b6fb78c56e76aedd1480429dd4e68da201a.zip
Fix SAK dialog momentary display when SAK disabled
Clean up build warnings in kdesktop
Diffstat (limited to 'tdm/kfrontend')
-rw-r--r--tdm/kfrontend/kgapp.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index 8fa0c18f..727bddf8 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -385,7 +385,9 @@ kg_main( const char *argv0 )
is_themed = false;
has_twin = has_twin_bkp;
delete tgrt;
- checkSAK(app);
+ if (trinity_desktop_lock_use_sak) {
+ checkSAK(app);
+ }
dialog = new KStdGreeter;
#ifdef WITH_XRANDR
dialog->move(dialog->x() + primaryScreenPosition.x(), dialog->y() + primaryScreenPosition.y());
@@ -398,7 +400,9 @@ kg_main( const char *argv0 )
}
XSetErrorHandler( (XErrorHandler)0 );
} else {
- checkSAK(app);
+ if (trinity_desktop_lock_use_sak) {
+ checkSAK(app);
+ }
dialog = new KStdGreeter;
#ifdef WITH_XRANDR
dialog->move(dialog->x() + primaryScreenPosition.x(), dialog->y() + primaryScreenPosition.y());