From: Dana Jansens <danakj@orodu.net>
Date: Thu, 10 Dec 2009 15:07:50 +0000 (-0500)
Subject: Remove desktop hints since Openbox won't overwrite them, but they may be set from... 
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=f0df9bb9d8f4f8182e60996d92a7b0e47549a0f6

Remove desktop hints since Openbox won't overwrite them, but they may be set from GDM or other sessions
---

diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in
index d93bab0c..86b7d06f 100644
--- 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 16017260..5299b045 100644
--- 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 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"