- Changes from DEVEL branch before kde-3.3.0 final - there ought to be

  moved to head with rev 1.360 of kdebase.spec !!!

Changed files:
    kdebase-kdm.Xsession -> 1.7

diff --git a/kdebase-kdm.Xsession b/kdebase-kdm.Xsession
index 3ad1016bab94263de6ff10e1e07d3f8720df8f57..c790ebb94abf643a3bfe1364d2f73e43f8590fff 100644 (file)
--- a/kdebase-kdm.Xsession
+++ b/kdebase-kdm.Xsession
@@ -15,100 +15,8 @@ case $SHELL in
        unset HAVE_LOGIN_SHELL  
 esac
 
-# Redirect errors to a file in user's home directory if possible
-errfn=xerr-$USER-$DISPLAY
-for errfile in "${TMPDIR-/tmp}/$errfn" "/tmp/$errfn" "$HOME/.$errfn"; do
-       if cp /dev/null "$errfile" 2> /dev/null ; then
-               chmod 600 "$errfile"
-               exec > "$errfile" 2>&1
-               break
-       fi
-done
-
-# System wide settings
-sysxkbmap=/etc/X11/xinit/Xkbmap
-sysmodmap=/etc/X11/xinit/Xmodmap
-sysresources=/etc/X11/xinit/Xresources
-
-# Also usable locations
-another_sysxkbmap=/etc/X11/Xkbmap
-another_sysmodmap=/etc/X11/Xmodmap
-another_sysresources=/etc/X11/Xresources
-
-# User settings
-userxkbmap=$HOME/.Xkbmap
-usermodmap=$HOME/.Xmodmap
-userresources=$HOME/.Xresources
-userdefaults=$HOME/.Xdefaults
-
-# Merge in defaults
-if [ -f $sysresources ]; then
-       xrdb -merge $sysresources
-elif [ -f $another_sysresources ]; then
-       xrdb -merge $another_sysresources
-fi             
-
-if [ -f $userresources ]; then
-       xrdb -merge $userresources
-elif [ -f $userdefaults ]; then
-       xrdb -merge $userdefaults
-fi
-
-# Merge in keymaps
-if [ -f "$sysxkbmap" ]; then
-       setxkbmap `cat "$sysxkbmap"`
-       XKB_IN_USE=yes
-elif [ -f "$another_sysxkbmap" ]; then
-       setxkbmap `cat "$another_sysxkbmap"`
-       XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
-       setxkbmap `cat "$userxkbmap"`
-       XKB_IN_USE=yes
-fi
-
-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
-       if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
-               xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
-               if [ -n "$xkbsymbols" ]; then
-                       setxkbmap -symbols "$xkbsymbols"
-                       XKB_IN_USE=yes
-               fi
-       fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
-       if [ -f $sysmodmap ]; then
-               xmodmap $sysmodmap
-       elif [ -f $another_sysmodmap ]; then
-               xmodmap $another_sysmodmap
-       fi              
-       if [ -f $usermodmap ]; then
-               xmodmap $usermodmap
-       fi      
-fi
-
-unset XKB_IN_USE
-
-# Run all system xinitrc shell scripts.
-for i in /etc/X11/xinit/xinitrc.d/* ; do
-       if [ -x "$i" ]; then
-               . "$i"
-       fi
-done
-
-# Keep in sync with Xclients from xinitrc-ng 
-syswmfile="/etc/sysconfig/desktop"
-
-# In this file "$wmstyledir" value may be given
-[ -f "$syswmfile" ] && . $syswmfile
-
-if [ -z "$wmstyledir" ]; then
-    # Keep in sync with Xclients from xinitrc-ng 
-    wmstyledir="/etc/sysconfig/wmstyle"
-fi
+# Call standard xinit actions
+. /etc/X11/xinit/xinitdefs
 
 case $1 in
     failsafe)
@@ -131,12 +39,5 @@ case $1 in
        fi
        ;;      
     *)
-       if [ -x "$HOME/bin/$1.sh" ]; then
-           exec "$HOME/bin/$1.sh"
-       elif [ -x "$wmstyledir/$1.sh" ]; then
-           exec "$wmstyledir/$1.sh"    
-       else    
-           [ `/usr/bin/which $1` ] && exec $1 || exec xmessage -center \
-           -buttons OK:0 -default OK "Sorry, $1 not found."
-       fi      
+       exec /etc/X11/xinit/Xclients $1
 esac