[gentoo-commits] gentoo-x86 commit in xfce-base/xfce-utils/files: xfce-utils-4.7.0-ck-launch-session.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/09/09 12:31:20

  Added:                xfce-utils-4.7.0-ck-launch-session.patch
  Log:
  Don't run ck-launch-session from xinitrc because latest xfce4-session will start consolekit session on it's own.
  
  (Portage version: 2.2_rc75/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session.patch?rev=1.1&content-type=text/plain

Index: xfce-utils-4.7.0-ck-launch-session.patch
===================================================================
From ea8c4b0db31855cb144cd5b863a045423d4afbfc Mon Sep 17 00:00:00 2001
From: Jannis Pohlmann <jannis@××××.org>
Date: Wed, 08 Sep 2010 10:04:05 +0000
Subject: Drop ck-launch-session as CK is handled in xfce4-session (bug #6684).

---
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'"
--
cgit v0.8.2.1