gnome-session r4999 - in trunk: . data

[mccann svn gnome org]

Author: mccann
Date: Tue Aug 26 18:07:51 2008
New Revision: 4999
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4999&view=rev

Log:
2008-08-26  William Jon McCann  <jmccann redhat com>

	* data/gnome-wm:
	Use the required components key if possible.



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

Modified: trunk/data/gnome-wm
==============================================================================
--- trunk/data/gnome-wm	(original)
+++ trunk/data/gnome-wm	Tue Aug 26 18:07:51 2008
@@ -40,6 +40,11 @@
   esac
 done
 
+# WINDOW_MANAGER overrides all
+if [ -z "$WINDOW_MANAGER" ] ; then
+    WINDOW_MANAGER=`gconftool-2 --get /desktop/gnome/session/required-components/windowmanager 2> /dev/null`
+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