From ec9a5d2f51ac26d77f63a8714dbef6e291548fdb Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Mon, 20 Dec 2010 21:09:17 -0600
Subject: desktop/lxde-common: Tweaks to xinitrc re consolekit pokeage

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 desktop/lxde-common/config/xinitrc.lxde | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'desktop/lxde-common/config')

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
-- 
cgit v1.2.3