- xfce4 support

[packages/kde4-kdebase-workspace.git] / kdebase-kdm.Xsession

diff --git a/kdebase-kdm.Xsession b/kdebase-kdm.Xsession
index a91a95d549e23839efbc7c6e0b3921f12c0dfb4d..107e8f0dc2f4032ef57231aef63b954c9d6acb2f 100644 (file)
--- a/kdebase-kdm.Xsession
+++ b/kdebase-kdm.Xsession
@@ -75,8 +75,12 @@ done
 # exec specified session or tell user if not found
 loadsess()
 {
-    [ `/usr/bin/which $sess` ] && exec $sess || exec xmessage -center -buttons OK:0 \
-       -default OK "Sorry, $sess not found."
+    if [ -f "$HOME/bin/$sess.sh" ]; then
+        exec "$HOME/bin/$sess.sh"
+    else    
+       [ `/usr/bin/which $sess` ] && exec $sess || exec xmessage -center \
+       -buttons OK:0 -default OK "Sorry, $sess not found."
+    fi 
 }
 
 # now, we see if xdm/gdm/kdm has asked for a specific environment
@@ -100,22 +104,19 @@ case $1 in
        sess=startxfce
        loadsess
        ;;
+    xfce4)
+       sess=xfce4-session
+       loadsess
+       ;;
     ""|default)
        # take default action
-       if [ -f "$HOME/.xsession" ]; then
-           exec "$HOME/.xsession"
-       elif [ -f "$HOME/.Xclients" ]; then
+       if [ -f "$HOME/.Xclients" ]; then
            exec "$HOME/.Xclients"
        else
            exec /etc/X11/xinit/Xclients
        fi
        ;;
     *)
-       sess=$*
-       if [ -f "$HOME/bin/$sess.sh" ]; then
-           exec "$HOME/bin/$sess.sh"
-       else    
-           loadsess
-       fi    
-       ;;              
+       sess=$1
+       loadsess
 esac