diff options
| author | Nick Schermer <nick@xfce.org> | 2012-04-11 14:48:47 +0200 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2012-04-11 14:49:11 +0200 |
| commit | b35b3bb6049852bc1bd28fd577a401f4b12e585e (patch) | |
| tree | 519c76efb6d739eb1f11ece342a899f6b60fba87 /scripts/xinitrc.in.in | |
| parent | ec48039196542f0fcdf3d030dab6737e4e8efc90 (diff) | |
| download | xfce4-session-b35b3bb6049852bc1bd28fd577a401f4b12e585e.tar.gz | |
Remove deprecated or unused code from xinit.
Diffstat (limited to 'scripts/xinitrc.in.in')
| -rwxr-xr-x | scripts/xinitrc.in.in | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in index 5f41a2a1..c67232ec 100755 --- a/scripts/xinitrc.in.in +++ b/scripts/xinitrc.in.in @@ -137,9 +137,7 @@ xsetroot -solid black -cursor_name watch xfsettingsd & xfwm4 --daemon -# start up stuff in $XDG_CONFIG_HOME/autostart/, as that looks to be -# the new standard. if that directory doesn't exist, try the old -# ~/Desktop/Autostart method. we're not going to do any migration here. +# start up stuff in $XDG_CONFIG_HOME/autostart/ if test -d "$XDG_CONFIG_HOME/autostart"; then for i in ${XDG_CONFIG_HOME}/autostart/*.desktop; do grep -q -E "^Hidden=true" "$i" && continue @@ -160,12 +158,6 @@ if test -d "$XDG_CONFIG_HOME/autostart"; then $cmd & fi done -elif test -d "$HOME/Desktop/Autostart"; then - for i in `ls -1 -L ${HOME}/Desktop/Autostart/ 2>/dev/null`; do - if test -x $HOME/Desktop/Autostart/$i; then - $HOME/Desktop/Autostart/$i & - fi - done fi xfdesktop& @@ -197,8 +189,4 @@ EOF ;; esac -if test "$ssh_agent_kill_cmd"; then - eval "$ssh_agent_kill_cmd" -fi - xsetroot -bg white -fg red -solid black -cursor_name watch |