From eaf5fadba819d19042e8ba6aee637a54b29cc8aa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 24 Apr 2012 19:21:48 -0500 Subject: Fix SAK dialog momentary display when SAK disabled Clean up build warnings in kdesktop (cherry picked from commit 30617b6fb78c56e76aedd1480429dd4e68da201a) --- kdm/kfrontend/kgapp.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'kdm') 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()); -- cgit v1.2.1