From 22bb08c499e1b9bd148c1af2814b268aa3371be1 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Mon, 20 Dec 2010 21:22:31 -0600
Subject: desktop/openbox: Poke consolekit in xinitrc

This commit includes a few other minor (mostly aesthetic)
tweaks to the xinitrc files.

Also note that I did not use ck-launch-session in the
kde- and gnome-specific xinitrc files; that's because
the kde/gnome session manager should have already taken
care of the needed bits in those cases.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 desktop/openbox/xinitrc.openbox-session | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'desktop/openbox/xinitrc.openbox-session')

diff --git a/desktop/openbox/xinitrc.openbox-session b/desktop/openbox/xinitrc.openbox-session
index 572ae8f8c0..007e979b77 100644
--- a/desktop/openbox/xinitrc.openbox-session
+++ b/desktop/openbox/xinitrc.openbox-session
@@ -7,22 +7,10 @@ sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    /usr/bin/xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    /usr/bin/xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
-    /usr/bin/xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
-    /usr/bin/xmodmap $usermodmap
-fi
+[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
 
 # Create default user directory & populate it if not already existent
 if [ ! -d $HOME/.config/openbox ]; then
@@ -31,4 +19,9 @@ if [ ! -d $HOME/.config/openbox ]; then
   cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
 fi
 
-exec openbox-session
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  exec ck-launch-session openbox-session
+else
+  exec openbox-session
+fi
+
-- 
cgit v1.2.3