gnome-session r4951 - in trunk: . data

[gheet svn gnome org]

Author: gheet
Date: Thu Aug 14 15:56:03 2008
New Revision: 4951
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4951&view=rev

Log:
2008-08-14  Ghee Teo <ghee teo sun com>

        * data/gnome-wm:
        Fixes bug #547769. Handle gconftool-2 errors properly.



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

Modified: trunk/data/gnome-wm
==============================================================================
--- trunk/data/gnome-wm	(original)
+++ trunk/data/gnome-wm	Thu Aug 14 15:56:03 2008
@@ -39,7 +39,7 @@
 
 # WINDOW_MANAGER overrides all
 if [ -z "$WINDOW_MANAGER" ] ; then
-  WINDOW_MANAGER=$(gconftool-2 --get /apps/gnome-session/gnome-wm/preferred_window_manager)
+  WINDOW_MANAGER=`gconftool-2 --get /apps/gnome-session/gnome-wm/preferred_window_manager 2> /dev/null`
 fi
 
 if [ -z "$WINDOW_MANAGER" ] ; then