summaryrefslogtreecommitdiffstats
path: root/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2011-04-25 13:37:00 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:45:18 +0200
commit75a4a592e5ccda30715f93563d741b83e0dcf39e (patch)
tree502f745607e77a2c4386ad38d818ddcafe81489c /source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
parentb76270bf9e6dd375e495fec92140a79a79415d27 (diff)
downloadcurrent-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.gz
current-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.xz
Slackware 13.37slackware-13.37
Mon Apr 25 13:37:00 UTC 2011 Slackware 13.37 x86_64 stable is released! Thanks to everyone who pitched in on this release: the Slackware team, the folks producing upstream code, and linuxquestions.org for providing a great forum for collaboration and testing. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. As always, thanks to the Slackware community for testing, suggestions, and feedback. :-) Have fun!
Diffstat (limited to 'source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff')
-rw-r--r--source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff10
1 files changed, 7 insertions, 3 deletions
diff --git a/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff b/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
index a8d5b2a5f..206f6607a 100644
--- a/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
+++ b/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
@@ -1,11 +1,15 @@
--- ./scripts/xinitrc.in.in.orig 2009-04-09 18:21:13.000000000 -0500
-+++ ./scripts/xinitrc.in.in 2010-05-06 03:06:02.000000000 -0500
-@@ -131,7 +131,7 @@
++++ ./scripts/xinitrc.in.in 2010-06-18 11:33:37.000000000 -0500
+@@ -131,7 +131,11 @@
x|xno*)
;;
*)
- $xfcesm
-+ ck-launch-session $xfcesm
++ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
++ ck-launch-session $xfcesm
++ else
++ $xfcesm
++ fi
if test $kill_sshagent -eq 1; then
eval `$sshagent -k`