diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-12-20 21:09:17 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-12-20 21:09:17 -0600 |
| commit | ec9a5d2f51ac26d77f63a8714dbef6e291548fdb (patch) | |
| tree | bf8f5a036a243e857d9a8809694ea160cfaebfa0 /desktop/lxde-common/config | |
| parent | c00f675facdc067b07ac4c87135bb5d01ab79085 (diff) | |
desktop/lxde-common: Tweaks to xinitrc re consolekit pokeage
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop/lxde-common/config')
| -rw-r--r-- | desktop/lxde-common/config/xinitrc.lxde | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/desktop/lxde-common/config/xinitrc.lxde b/desktop/lxde-common/config/xinitrc.lxde index 80187bb2f974c..89a8d89c55b6f 100644 --- a/desktop/lxde-common/config/xinitrc.lxde +++ b/desktop/lxde-common/config/xinitrc.lxde @@ -7,25 +7,13 @@ sysresources=/etc/X11/xinit/.Xresources sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi +[ -f $sysresources ] && xrdb -merge $sysresources +[ -f $sysmodmap ] && xmodmap $sysmodmap +[ -f $userresources ] && xrdb -merge $userresources +[ -f $usermodmap ] && xmodmap $usermodmap # Start the window manager: -if [ -z $XDG_SESSION_COOKIE ]; then +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then ck-launch-session startlxde else startlxde |