gnome-session r5046 - in trunk: . data

[vuntz svn gnome org]

Author: vuntz
Date: Tue Sep  2 15:12:57 2008
New Revision: 5046
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5046&view=rev

Log:
2008-09-02  Vincent Untz  <vuntz gnome org>

	* data/gnome-wm: avoid gnome-wm launching itself in loop when the
	configuration tells us to use... gnome-wm.


Modified:
   trunk/ChangeLog
   trunk/data/gnome-wm

Modified: trunk/data/gnome-wm
==============================================================================
--- trunk/data/gnome-wm	(original)
+++ trunk/data/gnome-wm	Tue Sep  2 15:12:57 2008
@@ -45,6 +45,12 @@
     WINDOW_MANAGER=`gconftool-2 --get /desktop/gnome/session/required_components/windowmanager 2> /dev/null`
 fi
 
+# Avoid looping if the session configuration tells us to use gnome-wm or if
+# the user forces gnome-wm via WINDOW_MANAGER
+if [ "x$WINDOW_MANAGER" = "xgnome-wm" ]; then
+  WINDOW_MANAGER=""
+fi
+
 if [ -z "$WINDOW_MANAGER" ] ; then
   # Create a list of window manager we can handle, trying to only use the
   # compositing ones when it makes sense