From 14f8b4cb544bf50d059b0feb85585e19b77752c7 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 24 Jan 2010 00:07:56 -0500 Subject: [PATCH 1/2] Fix bug #4492 better, the test in openbox-gnome-session needs to be inverted --- data/xsession/openbox-gnome-session.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in index 1f17edbc..8dd799c0 100644 --- a/data/xsession/openbox-gnome-session.in +++ b/data/xsession/openbox-gnome-session.in @@ -37,7 +37,7 @@ else if test -z "$SESSION"; then # if its empty then just run openbox SESSION="[openbox]" - elif echo "$SESSION" | grep -q openbox; then + elif ! echo "$SESSION" | grep -q openbox; then # if openbox isn't in the session then append it SESSION="${SESSION%]},openbox]" fi From 2ab63cb36f01de0edca91921e6608f67dd31c6f3 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 27 Jan 2010 20:01:24 -0500 Subject: [PATCH 2/2] make xdg-autostart use the OPENBOX environment by default, so you can say OnlyShowIn=OPENBOX in a .desktop and it will work as expected --- data/autostart.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/autostart.sh.in b/data/autostart.sh.in index 62a30e1c..eb55558a 100644 --- a/data/autostart.sh.in +++ b/data/autostart.sh.in @@ -38,7 +38,7 @@ fi # Run XDG autostart things. By default don't run anything desktop-specific # See xdg-autostart --help more info -DESKTOP_ENV="" +DESKTOP_ENV="OPENBOX" if which @secretbindir@/xdg-autostart >/dev/null; then @secretbindir@/xdg-autostart $DESKTOP_ENV fi