summaryrefslogtreecommitdiff
path: root/data/xsession/openbox-session.in
diff options
context:
space:
mode:
Diffstat (limited to 'data/xsession/openbox-session.in')
-rw-r--r--data/xsession/openbox-session.in9
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