Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 420745 | Differences between
and this patch

Collapse All | Expand All

(-)xfce4-session-4.10.0-old/scripts/xinitrc.in (-11 / +11 lines)
Lines 81-86 Link Here
81
# load local modmap
81
# load local modmap
82
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
82
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
83
83
84
# Use dbus-launch if installed.
85
if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
86
  if which dbus-launch >/dev/null 2>&1; then
87
    eval `dbus-launch --sh-syntax --exit-with-session`
88
    # some older versions of dbus don't export the var properly
89
    export DBUS_SESSION_BUS_ADDRESS
90
  else
91
    echo "Could not find dbus-launch; Xfce will not work properly" >&2
92
    fi
93
fi
94
84
# run xfce4-session if installed
95
# run xfce4-session if installed
85
if which xfce4-session >/dev/null 2>&1; then
96
if which xfce4-session >/dev/null 2>&1; then
86
97
Lines 118-134 Link Here
118
129
119
##################
130
##################
120
131
121
# Use dbus-launch if installed.
122
if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
123
  if which dbus-launch >/dev/null 2>&1; then
124
    eval `dbus-launch --sh-syntax --exit-with-session`
125
    # some older versions of dbus don't export the var properly
126
    export DBUS_SESSION_BUS_ADDRESS
127
  else
128
    echo "Could not find dbus-launch; Xfce will not work properly" >&2
129
    fi
130
fi
131
132
# this is only necessary when running w/o xfce4-session
132
# this is only necessary when running w/o xfce4-session
133
xsetroot -solid black -cursor_name watch
133
xsetroot -solid black -cursor_name watch
134
134
(-)xfce4-session-4.10.0-old/scripts/xinitrc.in.in (-11 / +11 lines)
Lines 81-86 Link Here
81
# load local modmap
81
# load local modmap
82
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
82
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
83
83
84
# Use dbus-launch if installed.
85
if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
86
  if which dbus-launch >/dev/null 2>&1; then
87
    eval `dbus-launch --sh-syntax --exit-with-session`
88
    # some older versions of dbus don't export the var properly
89
    export DBUS_SESSION_BUS_ADDRESS
90
  else
91
    echo "Could not find dbus-launch; Xfce will not work properly" >&2
92
    fi
93
fi
94
84
# run xfce4-session if installed
95
# run xfce4-session if installed
85
if which xfce4-session >/dev/null 2>&1; then
96
if which xfce4-session >/dev/null 2>&1; then
86
97
Lines 118-134 Link Here
118
129
119
##################
130
##################
120
131
121
# Use dbus-launch if installed.
122
if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
123
  if which dbus-launch >/dev/null 2>&1; then
124
    eval `dbus-launch --sh-syntax --exit-with-session`
125
    # some older versions of dbus don't export the var properly
126
    export DBUS_SESSION_BUS_ADDRESS
127
  else
128
    echo "Could not find dbus-launch; Xfce will not work properly" >&2
129
    fi
130
fi
131
132
# this is only necessary when running w/o xfce4-session
132
# this is only necessary when running w/o xfce4-session
133
xsetroot -solid black -cursor_name watch
133
xsetroot -solid black -cursor_name watch
134
134

Return to bug 420745