--- kdebase-3.4.92/startkde.startkde_mdk 2005-10-10 18:06:23.000000000 +0200 +++ kdebase-3.4.92/startkde 2005-10-18 09:46:21.000000000 +0200 @@ -18,9 +18,9 @@ # The standard X background is nasty, causing moire effects and exploding # people's heads. We use colours from the standard KDE palette for those with # palettised displays. -if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then - xsetroot -solid "#000000" -fi +#if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then + ## xsetroot -solid "#000000" +#fi # we have to unset this for Darwin since it will screw up KDE's dynamic-loading unset DYLD_FORCE_FLAT_NAMESPACE @@ -231,6 +231,41 @@ # xsetroot -cursor_name left_ptr +[ ! -d $kdehome/share/config ] && mkdir -p $kdehome/share/config + +if [ ! -e /dev/dsp ] && [ ! -e $kdehome/share/config/kcmartsrc ] ; then + echo "[Arts]" > $kdehome/share/config/kcmartsrc + echo "StartServer=false" >> $kdehome/share/config/kcmartsrc +fi +if [ "`whoami`" = root ] ; then + cd /usr/share/mdk/kde/root-interface/ + for i in *; do + if [ ! -e /root/.kde/share/config/$i ]; then + cp -fr $i /root/.kde/share/config/ + fi + done + cd - +else + if [ $(grep "META_CLASS=desktop" /etc/sysconfig/system) ]; then + if [ ! -e $kdehome/Autostart/openkmenu.desktop ] && [ ! -e $kdehome/Autostart/.openkmenu ]; then + [ ! -d $kdehome/Autostart ] && mkdir -p $kdehome/Autostart + cp /usr/share/mdk/kde/openkmenu.desktop $kdehome/Autostart/ && touch $kdehome/Autostart/.openkmenu + else + rm -f $kdehome/Autostart/openkmenu.desktop + fi + elif [ -e $kdehome/Autostart/openkmenu.desktop ]; then + rm -f $kdehome/Autostart/openkmenu.desktop + fi + +fi + +export DESKTOP="kde" + +machine_type=$(uname -m) +if [ $machine_type != "ppc" ] && [ $machine_type != "sparc" ] && [ $machine_type != "alpha" ] ; then + /usr/bin/test-windows-key +fi + # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap if test -n "$GS_LIB" ; then GS_LIB=$usr_fdir:$GS_LIB @@ -257,21 +293,6 @@ echo 'startkde: Starting up...' 1>&2 -# run KPersonalizer before the session, if this is the first login -if test "$kpersonalizerrc_general_firstlogin" = "true"; then - # start only dcopserver, don't start whole kdeinit (takes too long) - echo 'startkde: Running kpersonalizer...' 1>&2 - dcopserver - kwin --lock & - kpersonalizer --before-session - # handle kpersonalizer restarts (language change) - while test $? -eq 1; do - kpersonalizer --r --before-session - done - dcopquit kwin - dcopserver_shutdown --wait -fi - # the splashscreen and progress indicator case "$ksplashrc_ksplash_theme" in None)