gnome-session r4998 - in trunk: . data

[mccann svn gnome org]

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

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

	* data/gnome-session.schemas.in:
	* data/gnome-wm:
	Don't use gnome-wm by default.  We should encourage
	WMs to install a desktop file and to set
	/desktop/gnome/session/required-components/windowmanager



Modified:
   trunk/ChangeLog
   trunk/data/gnome-session.schemas.in
   trunk/data/gnome-wm

Modified: trunk/data/gnome-session.schemas.in
==============================================================================
--- trunk/data/gnome-session.schemas.in	(original)
+++ trunk/data/gnome-session.schemas.in	Tue Aug 26 17:51:21 2008
@@ -2,18 +2,6 @@
 <gconfschemafile>
    <schemalist>
 
-       <schema>
-         <key>/schemas/apps/gnome-session/gnome-wm/preferred_window_manager</key>
-         <applyto>/apps/gnome-session/gnome-wm/preferred_window_manager</applyto>
-         <owner>gnome</owner>
-         <type>string</type>
-         <default>metacity</default>
-         <locale name="C">
-          <short>Window Manager to start</short>
-          <long>The Window manager that gnome-session will start. Valid values are "metacity" and "compiz".</long>
-         </locale>
-      </schema>
-
       <schema>
          <key>/schemas/apps/gnome-session/options/show_splash_screen</key>
          <applyto>/apps/gnome-session/options/show_splash_screen</applyto>
@@ -76,7 +64,7 @@
          <owner>gnome</owner>
          <type>list</type>
          <list_type>string</list_type>
-         <default>[gnome-settings-daemon,gnome-wm,gnome-panel,nautilus]</default>
+         <default>[gnome-settings-daemon,metacity,gnome-panel,nautilus]</default>
          <locale name="C">
             <short>Default session</short>
             <long>List of applications that are part of the default session.</long>
@@ -99,7 +87,7 @@
          <applyto>/desktop/gnome/session/required-components/windowmanager</applyto>
          <owner>gnome</owner>
          <type>string</type>
-         <default>gnome-wm</default>
+         <default>metacity</default>
          <locale name="C">
             <short>Window Manager</short>
             <long>The window manager is the program that draws the title bar and borders around windows, and allows you to move and resize windows.</long>

Modified: trunk/data/gnome-wm
==============================================================================
--- trunk/data/gnome-wm	(original)
+++ trunk/data/gnome-wm	Tue Aug 26 17:51:21 2008
@@ -6,6 +6,9 @@
 # If this is not set, we search a list of known windowmanagers and use
 # the first one that is found in the users's PATH
 #
+# NOTE: DON'T USE THIS.  Please have your window manager install
+# a desktop file and change the gconf key
+# /desktop/gnome/session/required-components/windowmanager
 
 # sm-client-id value
 SMID=
@@ -37,11 +40,6 @@
   esac
 done
 
-# WINDOW_MANAGER overrides all
-if [ -z "$WINDOW_MANAGER" ] ; then
-  WINDOW_MANAGER=`gconftool-2 --get /apps/gnome-session/gnome-wm/preferred_window_manager 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