diff options
| author | Robby Workman <rw@rlworkman.net> | 2010-10-20 00:11:31 +0100 |
|---|---|---|
| committer | Michiel van Wessem <michiel@slackbuilds.org> | 2010-10-20 00:11:31 +0100 |
| commit | 12a983652f454ad0420cff993802df3aa3f68ea0 (patch) | |
| tree | a26910a868b88c233cc9c38243a4dd1dfcb9363c /desktop/icewm/xinitrc.icewm | |
| parent | 550fceb245407322e6eca336f3c44bb30617e99a (diff) | |
desktop/icewm: Updated for version 1.3.6.
Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>
Diffstat (limited to 'desktop/icewm/xinitrc.icewm')
| -rw-r--r-- | desktop/icewm/xinitrc.icewm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/desktop/icewm/xinitrc.icewm b/desktop/icewm/xinitrc.icewm index 825c128463f96..a93c203c52af9 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 |