diff options
| author | Nick Schermer <nick@xfce.org> | 2012-02-25 10:30:12 +0100 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2012-03-24 22:24:36 +0100 |
| commit | 03d0fc76a246c0ba90bc0684cc3562630917a0c4 (patch) | |
| tree | c7b35c3f97d08df0114f79924156b3631500d505 /scripts | |
| parent | 8909f54d68ac2bd567db43002066433f56f4d876 (diff) | |
| download | xfce4-session-03d0fc76a246c0ba90bc0684cc3562630917a0c4.tar.gz | |
Let xfce4-session handle the dbus-launch checking.
This makes it easier to start a fully working session
with only xfce4-session.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/xinitrc.in.in | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in index a5afc245..2bfaa45d 100755 --- a/scripts/xinitrc.in.in +++ b/scripts/xinitrc.in.in @@ -56,11 +56,6 @@ export GLADE_CATALOG_PATH export GLADE_PIXMAP_PATH export GLADE_MODULE_PATH -# Export GTK_PATH so that GTK+ can find the Xfce theme engine -# https://bugzilla.xfce.org/show_bug.cgi?id=7483 -#GTK_PATH="$GTK_PATH:@_libdir_@/gtk-2.0" -#export GTK_PATH - # For now, start with an empty list XRESOURCES="" @@ -89,17 +84,6 @@ 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 which 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 - # Run xfce4-session if installed if which xfce4-session >/dev/null 2>&1; then xfce4-session @@ -120,6 +104,16 @@ fi ################## +# Use dbus-launch if installed. +if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then + if which 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 # this is only necessary when running w/o xfce4-session xsetroot -solid black -cursor_name watch |