From 847a8e73e658bb9ced5eb7b12242b0064224f49e Mon Sep 17 00:00:00 2001
From: Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
Date: Sat, 19 Dec 2009 03:10:45 +0000
Subject: [PATCH 1/9] Launch dbus in startlxde when needed.

---
 startlxde.in |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/startlxde.in b/startlxde.in
index 8372d3a..31593a0 100755
--- a/startlxde.in
+++ b/startlxde.in
@@ -1,21 +1,21 @@
 #!/bin/sh
 
 if [ -z "$XDG_CONFIG_HOME" ]; then
-    export XDG_CONFIG_HOME="$HOME/.config"
+	export XDG_CONFIG_HOME="$HOME/.config"
 fi
 
 # Ensure the existance of pcmanfm config file
 PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
 if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then
-    mkdir -p "$PCMANFM_CONF_DIR"
-    cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde"
+	mkdir -p "$PCMANFM_CONF_DIR"
+	cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde"
 fi
 
 # Ensure the existance of openbox config file
 OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox"
 if [ ! -f "$OPENBOX_CONF_DIR/lxde-rc.xml" ]; then
-    mkdir -p "$OPENBOX_CONF_DIR"
-    cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
+	mkdir -p "$OPENBOX_CONF_DIR"
+	cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
 fi
 
 # Clean up after GDM (GDM sets the number of desktops to one)
@@ -24,5 +24,10 @@ xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _
 # Enable GTK+2 integration for OpenOffice.org, if available.
 export SAL_USE_VCLPLUGIN=gtk
 
+# Launch DBus if needed
+if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+	eval "$(dbus-launch --sh-syntax --exit-with-session)"
+fi
+
 # Start the LXDE session
 exec @prefix@/bin/lxsession -s LXDE -e LXDE
-- 
1.6.6.1