Changeset View
Changeset View
Standalone View
Standalone View
en_US.ISO8859-1/htdocs/xfce/dot.xinitrc.diff
--- .xinitrc.orig | |||||
+++ .xinitrc | |||||
@@ -87,6 +87,17 @@ | |||||
# 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 | |||||
@@ -124,17 +135,6 @@ | |||||
################## | |||||
-# 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 | |||||