[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2006-10-13 18:16:31
Message-ID: 1160763391.345328.26582.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 595252 by ossi:

backport: prevent spash screen from fighting with screen locker


 M  +20 -16    startkde  


--- branches/KDE/3.5/kdebase/startkde #595251:595252
@@ -133,11 +133,14 @@
     done
 fi
 
+dl=$DESKTOP_LOCKED
+unset DESKTOP_LOCKED # Don't want it in the environment
+
 # Launch splash that doesn't need any KDE libraries here, before
 # KDE libraries are loaded into memory (which may take some time
 # with cold caches). Makes the splash appear sooner.
 # If kpersonalizer needs to be run splash will be started only later.
-if test "$kpersonalizerrc_general_firstlogin" != "true"; then
+if test -z "$dl" && test "$kpersonalizerrc_general_firstlogin" != "true"; then
     case "$ksplashrc_ksplash_theme" in 
       Simple)
          ksplashsimple 
@@ -294,19 +297,21 @@
     dcopserver_shutdown --wait
 fi
 
-# the splashscreen and progress indicator
-case "$ksplashrc_ksplash_theme" in 
-  None)
-     ;; # nothing
-  Simple)
-     if test "$kpersonalizerrc_general_firstlogin" = "true"; then
-         ksplashsimple 
-     fi # otherwise started earlier
-     ;;
-  *)
-     ksplash --nodcop
-     ;;
-esac
+if test -z "$dl"; then
+  # the splashscreen and progress indicator
+  case "$ksplashrc_ksplash_theme" in 
+    None)
+       ;; # nothing
+    Simple)
+       if test "$kpersonalizerrc_general_firstlogin" = "true"; then
+           ksplashsimple 
+       fi # otherwise started earlier
+       ;;
+    *)
+       ksplash --nodcop
+       ;;
+  esac
+fi
 
 # Mark that full KDE session is running (e.g. Konqueror preloading works only
 # with full KDE running). The KDE_FULL_SESSION property can be detected by
@@ -337,8 +342,7 @@
 
 # If the session should be locked from the start (locked autologin),
 # lock now and do the rest of the KDE startup underneath the locker.
-if test -n "$DESKTOP_LOCKED"; then
-  unset DESKTOP_LOCKED # Won't need it any more
+if test -n "$dl"; then
   kwrapper kdesktop_lock --forcelock &
   # Give it some time for starting up. This is somewhat unclean; some
   # notification would be better.
[prev in list] [next in list] [prev in thread] [next in thread]