diff options
Diffstat (limited to 'kdm/kfrontend/kgapp.cpp')
| -rw-r--r-- | kdm/kfrontend/kgapp.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index 27771d2e0..84c86327e 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -200,6 +200,11 @@ kg_main( const char *argv0 ) #else trinity_desktop_lock_use_sak = false; #endif + if (trinity_desktop_lock_use_sak) { + if (system(KDE_BINDIR "/tsak checkdeps") != 0) { + trinity_desktop_lock_use_sak = false; + } + } if (trinity_desktop_lock_use_sak) { tsak = new KProcess; *tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak"; @@ -255,10 +260,11 @@ kg_main( const char *argv0 ) XSetErrorHandler( (XErrorHandler)0 ); GreeterApp *app; - if ( (argb_visual_available == true) && (!_compositor.isEmpty()) ) { + if ((!_compositor.isEmpty()) && ( argb_visual_available == true )) { app = new GreeterApp(dpyi, Qt::HANDLE( visual ), Qt::HANDLE( colormap )); } else { + argb_visual_available = false; app = new GreeterApp(); } // End ARGB initialization @@ -331,6 +337,11 @@ kg_main( const char *argv0 ) } kwin = new KProcess; *kwin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii(); + if (_windowManager == "kwin") { + // Special case + // Do not allow kwin to start kompmgr... + *kwin << "--disablecompositionmanager"; + } kwin->start(); has_kwin = true; } @@ -464,7 +475,7 @@ kg_main( const char *argv0 ) if (userinfo) { TQString newuid = TQString("%1").arg(userinfo->pw_uid); // kompmgr allows us to change its uid in this manner: - // 1.) Send SIGUSER1 + // 1.) Send SIGUSR1 // 2.) Send the new UID to it on the command line comp->kill(SIGUSR1); comp->writeStdin(newuid.ascii(), newuid.length()); |