[Xfce4-commits] <xfce-utils:master> Drop ck-launch-session as CK is handled in xfce4-session (bug #6684).

[Jannis Pohlmann]

Updating branch refs/heads/master
         to ea8c4b0db31855cb144cd5b863a045423d4afbfc (commit)
       from a2cee59c218ca59e78fd54026bf0f144ee33452d (commit)

commit ea8c4b0db31855cb144cd5b863a045423d4afbfc
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Wed Sep 8 12:04:05 2010 +0200

    Drop ck-launch-session as CK is handled in xfce4-session (bug #6684).

 scripts/xinitrc.in.in |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
index 2aaf1df..2bd43ec 100755
--- a/scripts/xinitrc.in.in
+++ b/scripts/xinitrc.in.in
@@ -196,11 +196,7 @@ fi
 
 # Run xfce4-session if installed
 if which xfce4-session >/dev/null 2>&1; then
-    if which ck-launch-session >/dev/null 2>&1; then
-      ck-launch-session xfce4-session
-    else
-      xfce4-session
-    fi
+    xfce4-session
 
     if test "$ssh_agent_kill_cmd"; then
         echo "running '$ssh_agent_kill_cmd'"