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 +++++-----------------
 desktop/lxde-common/lxde-common.SlackBuild |  2 +-
 2 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'desktop')

diff --git a/desktop/lxde-common/config/xinitrc.lxde b/desktop/lxde-common/config/xinitrc.lxde
index 80187bb2f9..89a8d89c55 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
diff --git a/desktop/lxde-common/lxde-common.SlackBuild b/desktop/lxde-common/lxde-common.SlackBuild
index 37f97c6be8..2cf9ba96f8 100644
--- a/desktop/lxde-common/lxde-common.SlackBuild
+++ b/desktop/lxde-common/lxde-common.SlackBuild
@@ -46,7 +46,7 @@
 
 PRGNAM=lxde-common
 VERSION=${VERSION:-0.5.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
-- 
cgit v1.2.3