rpms/xorg-x11-xinit/F-8 Xsession,1.7,1.8

Peter Jones (pjones) fedora-extras-commits at redhat.com
Tue Oct 23 18:46:01 UTC 2007


Author: pjones

Update of /cvs/extras/rpms/xorg-x11-xinit/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2581

Modified Files:
	Xsession 
Log Message:
- revert last change, it was dumb.


Index: Xsession
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-xinit/F-8/Xsession,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Xsession	23 Oct 2007 18:33:03 -0000	1.7
+++ Xsession	23 Oct 2007 18:45:28 -0000	1.8
@@ -40,7 +40,7 @@
 # this script. 
 XCLIENTS_D=/etc/X11/xinit/Xclients.d
 if [ -d "$XCLIENTS_D" -a "$#" -eq 1 -a -x "$XCLIENTS_D/Xclients.$1.sh" ]; then
-    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH $XCLIENTS_D/Xclients.$1.sh"
+    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $XCLIENTS_D/Xclients.$1.sh"
 else
 # now, we see if xdm/gdm/kdm has asked for a specific environment
 case $# in
@@ -54,11 +54,11 @@
 	    exec -l $SHELL -c "xterm -geometry 80x24-0-0"
 	    ;;
 	gnome)
-	    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH gnome-session"
-	    exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH gnome-session\"" 
+	    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session"
+	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH gnome-session\"" 
 	    ;;
 	kde|kde1|kde2)
-	    exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH startkde\""
+	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH startkde\""
 	    ;;
 	twm)
         # fall back to twm
@@ -78,11 +78,11 @@
 
 # otherwise, take default action
 if [ -x "$HOME/.xsession" ]; then
-    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH $HOME/.xsession"
+    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.xsession"
 elif [ -x "$HOME/.Xclients" ]; then
-    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients"
+    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients"
 elif [ -x /etc/X11/xinit/Xclients ]; then
-    exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients"
+    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients"
 else
     # should never get here; failsafe fallback
     exec -l $SHELL -c "xsm"




More information about the fedora-extras-commits mailing list