rpms/lxde-common/F-12 lxde-common-0.3.2.1-gdm-number-of-desktops.patch, 1.1, 1.2

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20536

Modified Files:
	lxde-common-0.3.2.1-gdm-number-of-desktops.patch 
Log Message:
update gdm-number-of-desktops.patch

lxde-common-0.3.2.1-gdm-number-of-desktops.patch:
 startlxde.in |    3 +++
 1 file changed, 3 insertions(+)

Index: lxde-common-0.3.2.1-gdm-number-of-desktops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-12/lxde-common-0.3.2.1-gdm-number-of-desktops.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-common-0.3.2.1-gdm-number-of-desktops.patch	1 Nov 2008 02:53:36 -0000	1.1
+++ lxde-common-0.3.2.1-gdm-number-of-desktops.patch	27 Oct 2009 00:18:15 -0000	1.2
@@ -1,16 +1,11 @@
 --- lxde-common-0.3.2.1.orig/startlxde.in	2008-04-20 10:26:19.000000000 +0200
 +++ lxde-common-0.3.2.1/startlxde.in	2008-11-01 01:52:54.000000000 +0100
-@@ -18,6 +18,14 @@
+@@ -18,6 +18,9 @@
      cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
  fi
  
-+# Workaround for gdm, openbox and the number of desktops
-+NUMBER_DESKTOPS=`grep \<number\> "$OPENBOX_CONF_DIR/lxde-rc.xml" | awk -F \> {'print $2}' | awk -F \< {'print $1}'`
-+if test x"`which wmctrl 2>/dev/null`" != x""; then
-+    (until [ `wmctrl -d | wc -l ` = "$NUMBER_DESKTOPS" ];do
-+	wmctrl -n "$NUMBER_DESKTOPS"
-+    done) &
-+fi
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 +
  # Enable GTK+2 integration for OpenOffice.org, if available.
  export SAL_USE_VCLPLUGIN=gtk