diff options
| author | Timothy Pearson <[email protected]> | 2012-04-24 19:21:48 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-03 03:27:11 +0200 |
| commit | eaf5fadba819d19042e8ba6aee637a54b29cc8aa (patch) | |
| tree | c9af17178b98847227fd2906258e32cab3765ef3 /kdm | |
| parent | 33d5f26e9ee2830794bdce99522fe324001d42a7 (diff) | |
| download | tdebase-eaf5fadba819d19042e8ba6aee637a54b29cc8aa.tar.gz tdebase-eaf5fadba819d19042e8ba6aee637a54b29cc8aa.zip | |
Fix SAK dialog momentary display when SAK disabled
Clean up build warnings in kdesktop
(cherry picked from commit 30617b6fb78c56e76aedd1480429dd4e68da201a)
Diffstat (limited to 'kdm')
| -rw-r--r-- | kdm/kfrontend/kgapp.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index 34c6c3f15..1999856de 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -385,7 +385,9 @@ kg_main( const char *argv0 ) is_themed = false; has_kwin = has_kwin_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()); |