gnome-session r4899 - in branches/dbus_based: . data gnome-session

[mccann svn gnome org]

Author: mccann
Date: Thu Jul 31 19:56:20 2008
New Revision: 4899
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4899&view=rev

Log:
2008-07-31  William Jon McCann  <jmccann redhat com>

	* data/Makefile.am:
	* data/gnome-session.schemas.in:
	* data/gnome-wm:
	* data/gnome-wm.desktop.in:
	* gnome-session/gsm-util.c (gsm_util_get_app_dirs):
	Install a desktop file for gnome-wm and use that
	as the default window manager instead of calling
	metacity directly.  Add a gconf key to allow
	changing the default program for gnome-wm to use.
	Remove the gnome/wm-properties directory from
	the autostart search path.



Added:
   branches/dbus_based/data/gnome-wm.desktop.in
Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/data/Makefile.am
   branches/dbus_based/data/gnome-session.schemas.in
   branches/dbus_based/data/gnome-wm
   branches/dbus_based/gnome-session/gsm-util.c

Modified: branches/dbus_based/data/Makefile.am
==============================================================================
--- branches/dbus_based/data/Makefile.am	(original)
+++ branches/dbus_based/data/Makefile.am	Thu Jul 31 19:56:20 2008
@@ -1,7 +1,7 @@
 SUBDIRS = icons
 
 gladedir = $(datadir)/gnome-session
-glade_DATA = session-properties.glade 
+glade_DATA = session-properties.glade
 
 @INTLTOOL_DESKTOP_RULE@
 
@@ -20,6 +20,10 @@
 
 bin_SCRIPTS = gnome-wm
 
+autostartdir = $(datadir)/gnome/autostart
+autostart_in_files = gnome-wm.desktop.in
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+
 settingsdir = $(datadir)/applications
 settings_in_files = session-properties.desktop.in
 settings_DATA = $(settings_in_files:.desktop.in=.desktop)
@@ -38,10 +42,12 @@
 	session-properties.desktop.in		\
 	$(xsession_in_files)			\
 	$(schemas_in_files)			\
+	$(autostart_in_files)			\
 	$(glade_DATA)				\
 	$(pixmap_DATA)
 
 DISTCLEANFILES =				\
 	$(schemas_DATA)				\
 	$(xsession_DATA)			\
+	$(autostart_DATA)			\
 	$(settings_DATA)

Modified: branches/dbus_based/data/gnome-session.schemas.in
==============================================================================
--- branches/dbus_based/data/gnome-session.schemas.in	(original)
+++ branches/dbus_based/data/gnome-session.schemas.in	Thu Jul 31 19:56:20 2008
@@ -1,6 +1,19 @@
 <?xml version="1.0"?>
 <gconfschemafile>
    <schemalist>
+
+       <schema>
+         <key>/schemas/apps/gnome-session/gnome-wm/prefered_window_manager</key>
+         <applyto>/apps/gnome-session/gnome-wm/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>
@@ -63,7 +76,7 @@
          <owner>gnome</owner>
          <type>list</type>
          <list_type>string</list_type>
-         <default>[gnome-settings-daemon,metacity,gnome-panel,nautilus]</default>
+         <default>[gnome-settings-daemon,gnome-wm,gnome-panel,nautilus]</default>
          <locale name="C">
             <short>Default session</short>
             <long>List of applications that are part of the default session.</long>
@@ -86,7 +99,7 @@
          <applyto>/desktop/gnome/session/required-components/windowmanager</applyto>
          <owner>gnome</owner>
          <type>string</type>
-         <default>metacity</default>
+         <default>gnome-wm</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: branches/dbus_based/data/gnome-wm
==============================================================================
--- branches/dbus_based/data/gnome-wm	(original)
+++ branches/dbus_based/data/gnome-wm	Thu Jul 31 19:56:20 2008
@@ -38,6 +38,9 @@
 done
 
 # WINDOW_MANAGER overrides all
+if [ -z "$WINDOW_MANAGER" ] ; then
+  WINDOW_MANAGER=$(gconftool-2 --get /apps/gnome-session/gnome-wm/preferred_window_manager)
+fi
 
 if [ -z "$WINDOW_MANAGER" ] ; then
   # Create a list of window manager we can handle, trying to only use the

Added: branches/dbus_based/data/gnome-wm.desktop.in
==============================================================================
--- (empty file)
+++ branches/dbus_based/data/gnome-wm.desktop.in	Thu Jul 31 19:56:20 2008
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Window Manager
+Exec=gnome-wm
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-session
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=true

Modified: branches/dbus_based/gnome-session/gsm-util.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-util.c	(original)
+++ branches/dbus_based/gnome-session/gsm-util.c	Thu Jul 31 19:56:20 2008
@@ -87,10 +87,6 @@
       g_ptr_array_add (dirs,
                        g_build_filename (system_data_dirs[i], "applications",
                                          NULL));
-
-      g_ptr_array_add (dirs,
-                       g_build_filename (system_data_dirs[i], "gnome", "wm-properties",
-                                         NULL));
     }
 
   g_ptr_array_add (dirs, NULL);