[Xfce4-commits] <xfce-utils:master> start ssh-agent before dbus so dbus has the env vars set

[Brian J. Tarricone]

Updating branch refs/heads/master
         to 0ba88f762767b035a50f8bd806d8968f5a027125 (commit)
       from ffcf9ec74492453cc4dc89e7d2a4a540a33cb3c2 (commit)

commit 0ba88f762767b035a50f8bd806d8968f5a027125
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Tue Dec 8 23:06:09 2009 -0800

    start ssh-agent before dbus so dbus has the env vars set

 scripts/xinitrc.in.in |   76 ++++++++++++++++++++++++------------------------
 1 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
index fdca950..524c363 100755
--- a/scripts/xinitrc.in.in
+++ b/scripts/xinitrc.in.in
@@ -100,44 +100,6 @@ cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
 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 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`
-if test $UID -gt 0 -a -z "$VNCSESSION" -a "$screensaver_enabled" != "false"; then
-    screensaver_type=`xfconf-query -c xfce4-session -p /startup/screensaver/type`
-
-    case "$screensaver_type" in
-        xscreensaver)
-            xscreensaver -no-splash &
-            ;;
-
-        gnome-screensaver)
-            gnome-screensaver &
-            ;;
-
-        *)
-            if test x"`which xscreensaver 2>/dev/null`" != x""; then
-                xscreensaver -no-splash &
-            elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then
-                gnome-screensaver &
-            fi
-            ;;
-    esac
-fi
-
-
 # launch gpg-agent or ssh-agent if enabled.
 ssh_agent_enabled=`xfconf-query -c xfce4-session -p /startup/ssh-agent/enabled`
 if test "$ssh_agent_enabled" != "false"; then
@@ -193,6 +155,44 @@ 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`
+if test $UID -gt 0 -a -z "$VNCSESSION" -a "$screensaver_enabled" != "false"; then
+    screensaver_type=`xfconf-query -c xfce4-session -p /startup/screensaver/type`
+
+    case "$screensaver_type" in
+        xscreensaver)
+            xscreensaver -no-splash &
+            ;;
+
+        gnome-screensaver)
+            gnome-screensaver &
+            ;;
+
+        *)
+            if test x"`which xscreensaver 2>/dev/null`" != x""; then
+                xscreensaver -no-splash &
+            elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then
+                gnome-screensaver &
+            fi
+            ;;
+    esac
+fi
+
+
 # Run xfce4-session if installed
 if type xfce4-session >/dev/null 2>&1; then
     xfce4-session