Remove desktop hints since Openbox won't overwrite them, but they may be set from...

diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in
index d93bab0cca67f22d9e360d33bbf972bcb983b3ff..86b7d06f266e7c5d5dbc08a47b760c42d8bee8dc 100644 (file)
--- a/data/xsession/openbox-gnome-session.in
+++ b/data/xsession/openbox-gnome-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
+
 VER=$(gnome-session --version 2>/dev/null | \
       sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
 

diff --git a/data/xsession/openbox-kde-session.in b/data/xsession/openbox-kde-session.in
index 160172605b06e160120fda8133ab59fe52ec4389..5299b0456dee6b66858724e409024f514fc61372 100644 (file)
--- a/data/xsession/openbox-kde-session.in
+++ b/data/xsession/openbox-kde-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
+
 # Run KDE with Openbox as its window manager
 export KDEWM="@bindir@/openbox"
 exec startkde "$@"

diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index 7c3daa73ed78f0a55f06b2d23402d357d51048d9..fa1bb99693a96654945825845488681b12d1f31e 100644 (file)
--- 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"