From 5290af9f50c8492398e9f1c61be8f659106bc591 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 9 Dec 2009 10:23:00 -0500 Subject: Use test -r instead of test -e for solaris. Fixes bug #4253. --- data/xsession/openbox-session.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/xsession/openbox-session.in') diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in index 259dc580..7c3daa73 100644 --- a/data/xsession/openbox-session.in +++ b/data/xsession/openbox-session.in @@ -10,10 +10,10 @@ fi 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 -- cgit v1.2.3 From f0df9bb9d8f4f8182e60996d92a7b0e47549a0f6 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 10 Dec 2009 10:07:50 -0500 Subject: Remove desktop hints since Openbox won't overwrite them, but they may be set from GDM or other sessions --- data/xsession/openbox-session.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'data/xsession/openbox-session.in') diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in index 7c3daa73..fa1bb996 100644 --- a/data/xsession/openbox-session.in +++ b/data/xsession/openbox-session.in @@ -7,6 +7,11 @@ 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" -- cgit v1.2.3