From 12a983652f454ad0420cff993802df3aa3f68ea0 Mon Sep 17 00:00:00 2001
From: Robby Workman <rw@rlworkman.net>
Date: Wed, 20 Oct 2010 00:11:31 +0100
Subject: desktop/icewm: Updated for version 1.3.6.

Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>
---
 desktop/icewm/xinitrc.icewm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'desktop/icewm/xinitrc.icewm')

diff --git a/desktop/icewm/xinitrc.icewm b/desktop/icewm/xinitrc.icewm
index 825c128463..a93c203c52 100644
--- a/desktop/icewm/xinitrc.icewm
+++ b/desktop/icewm/xinitrc.icewm
@@ -2,8 +2,8 @@
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-sysresources=@LIBDIR@/X11/xinit/.Xresources
-sysmodmap=@LIBDIR@/X11/xinit/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
 
 # Merge in defaults and keymaps
 [ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
@@ -22,5 +22,10 @@ fi
 # Start IceWM
 icewmbg &
 icewmtray &
-exec icewm-session
+
+if [ -z "$XDG_SESSION_COOKIE" -a -x /usr/bin/ck-launch-session ]; then
+  ck-launch-session icewm-session
+else
+  exec icewm-session
+fi
 
-- 
cgit v1.2.3