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

List:       kde-commits
Subject:    kdebase
From:       Stephan Kulow <coolo () kde ! org>
Date:       2005-02-03 9:55:26
Message-ID: 20050203095526.81BDA1CF5F () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

new version


  M +37 -11    startkde   1.144


--- kdebase/startkde  #1.143:1.144
@@ -1,5 +1,5 @@
 #!/bin/sh
 #
-#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.3.91 )
+#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.3.92 )
 #
 
@@ -20,5 +20,5 @@
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#C0C0C0"
+  : # xsetroot -solid "#C0C0C0"
 fi
 
@@ -58,4 +58,26 @@
 test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
 
+# start simple splashs first
+mkdir -p $kdehome/.kde/share/apps/ksplash
+if test ! -e $kdehome/.kde/share/apps/ksplash/rctheme; then
+   echo "splash=ksplashx-suse" > $kdehome/.kde/share/apps/ksplash/rctheme
+fi
+
+if test $kdehome/.kde/share/apps/ksplash/rctheme -ot \
/opt/kde3/share/config/ksplashrc || \ +   test /opt/kde3/share/config/ksplashrc -nt \
$kdehome/.kde/share/apps/ksplash/rctheme; then +     splash=`kreadconfig --file \
ksplashrc --group KSplash --key Theme` +     echo "splash=$splash" > \
$kdehome/.kde/share/apps/ksplash/rctheme +fi
+. $kdehome/.kde/share/apps/ksplash/rctheme
+case $splash in
+   ksplashx-*)
+       if test -x /opt/kde3/bin/ksplashx; then
+         /opt/kde3/bin/ksplashx ${splash#ksplashx-}
+       else
+         splash=Default
+       fi
+       ;;
+esac
+
 # Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
 # (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is \
installed) @@ -181,5 +203,5 @@
 
 # run KPersonalizer before the session, if this is the first login
-if kreadconfig --file kpersonalizerrc --group General --key FirstLogin --default \
true --type bool; then +if false && kreadconfig --file kpersonalizerrc --group \
General --key FirstLogin --default true --type bool; then  # start only dcopserver, \
don't start whole kdeinit (takes too long)  echo 'startkde: Running kpersonalizer...' \
1>&2 @@ -197,12 +219,16 @@
 
 # the splashscreen and progress indicator
-splash=`kreadconfig --file ksplashrc --group KSplash --key Theme`
-if test "$splash" = "None"; then
-    echo >/dev/null #nothing
-elif test "$splash" = "Simple"; then
-    ksplashsimple
-else
-    ksplash --nodcop
-fi
+case "$splash" in 
+  None)
+     ;; # nothing
+  ksplashx-*)
+     ;; # started earlier
+  Simple)
+     ksplashsimple 
+     ;;
+  *)
+     ksplash --nodcop
+     ;;
+esac
 
 # certain features such as Konqueror preloading work only with full KDE running


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