[Xfce4-commits] <xfce-utils:master> Spawn dbus-launch before the dbus users (bug #5576).

[Nick Schermer]

Updating branch refs/heads/master
         to 7fdb70fc2da783572ef02a8eb608e1147d2ef2a6 (commit)
       from 585418f4276494d56d3cf4106dcfda526be2b514 (commit)

commit 7fdb70fc2da783572ef02a8eb608e1147d2ef2a6
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jul 26 20:15:21 2010 +0200

    Spawn dbus-launch before the dbus users (bug #5576).
    
    xfconf-query already uses dbus, so move this code block
    more upwards.

 scripts/xinitrc.in.in |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
index 949a482..43deed6 100755
--- a/scripts/xinitrc.in.in
+++ b/scripts/xinitrc.in.in
@@ -99,6 +99,16 @@ cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
 # load local modmap
 test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
 
+# Use dbus-launch if installed.
+if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
+    if type dbus-launch >/dev/null 2>&1; then
+		eval `dbus-launch --sh-syntax --exit-with-session`
+        # some older versions of dbus don't export the var properly
+        export DBUS_SESSION_BUS_ADDRESS
+    else
+        echo "Could not find dbus-launch; Xfce will not work properly" >&2
+	fi
+fi
 
 # launch gpg-agent or ssh-agent if enabled.
 ssh_agent_enabled=`xfconf-query -c xfce4-session -p /startup/ssh-agent/enabled 2> /dev/null`
@@ -155,18 +165,6 @@ if test "$ssh_agent_enabled" != "false"; then
 fi
 
 
-# Use dbus-launch if installed.
-if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
-    if type dbus-launch >/dev/null 2>&1; then
-		eval `dbus-launch --sh-syntax --exit-with-session`
-        # some older versions of dbus don't export the var properly
-        export DBUS_SESSION_BUS_ADDRESS
-    else
-        echo "Could not find dbus-launch; Xfce will not work properly" >&2
-	fi
-fi
-
-
 # launch a screensaver if enabled.  do not launch if we're root or if
 # we're in a VNC session.
 screensaver_enabled=`xfconf-query -c xfce4-session -p /startup/screensaver/enabled 2> /dev/null`