diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
| commit | acafa38c8ea210b12ed92fc16281b915ab61542c (patch) | |
| tree | ce4c7d2a4a9b3478a4d48af2c54ada06593ed022 /data/xsession/openbox-session.in | |
| parent | 2f09e0ce388f63c341cb328d795766e2bd0dc24b (diff) | |
| parent | 9ba2b04e96449fea5b6bd212aa3d431638754bdd (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/config.c
openbox/event.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
openbox/screen.h
Diffstat (limited to 'data/xsession/openbox-session.in')
| -rw-r--r-- | data/xsession/openbox-session.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in index 259dc580..fa1bb996 100644 --- a/data/xsession/openbox-session.in +++ b/data/xsession/openbox-session.in @@ -7,13 +7,18 @@ if test -n "$1"; then exit fi +# Clean up after GDM +xprop -root -remove _NET_NUMBER_OF_DESKTOPS \ + -remove _NET_DESKTOP_NAMES \ + -remove _NET_CURRENT_DESKTOP 2> /dev/null + AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh" GLOBALAUTOSTART="@configdir@/openbox/autostart.sh" -if test -e $AUTOSTART; then +if test -r $AUTOSTART; then . $AUTOSTART else - if test -e $GLOBALAUTOSTART; then + if test -r $GLOBALAUTOSTART; then . $GLOBALAUTOSTART fi fi |