gdm r6031 - in trunk: . gui/simple-greeter

[mccann svn gnome org]

Author: mccann
Date: Mon Mar 17 17:59:40 2008
New Revision: 6031
URL: http://svn.gnome.org/viewvc/gdm?rev=6031&view=rev

Log:
2008-03-17  William Jon McCann  <jmccann redhat com>

	* gui/simple-greeter/gdm-greeter-session.c: (start_window_manager):
	* gui/simple-greeter/gdm-simple-greeter.schemas.in:
	Add a gconf key to enable preferring compiz over metacity.



Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-greeter-session.c
   trunk/gui/simple-greeter/gdm-simple-greeter.schemas.in

Modified: trunk/gui/simple-greeter/gdm-greeter-session.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-session.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-session.c	Mon Mar 17 17:59:40 2008
@@ -47,11 +47,14 @@
 #define GSD_DBUS_PATH      "/org/gnome/SettingsDaemon"
 #define GSD_DBUS_INTERFACE "org.gnome.SettingsDaemon"
 
-#define KEY_GDM_A11Y_DIR            "/apps/gdm/simple-greeter/accessibility"
+#define KEY_GDM_DIR                 "/apps/gdm/simple-greeter"
+#define KEY_GDM_A11Y_DIR             KEY_GDM_DIR "/accessibility"
 #define KEY_SCREEN_KEYBOARD_ENABLED  KEY_GDM_A11Y_DIR "/screen_keyboard_enabled"
 #define KEY_SCREEN_MAGNIFIER_ENABLED KEY_GDM_A11Y_DIR "/screen_magnifier_enabled"
 #define KEY_SCREEN_READER_ENABLED    KEY_GDM_A11Y_DIR "/screen_reader_enabled"
 
+#define KEY_WM_USE_COMPIZ            KEY_GDM_DIR "/wm_use_compiz"
+
 struct GdmGreeterSessionPrivate
 {
         GdmGreeterClient      *client;
@@ -401,9 +404,19 @@
 static void
 start_window_manager (GdmGreeterSession *session)
 {
-        if (! launch_metacity (session)) {
-                launch_compiz (session);
+        gboolean     use_compiz;
+        GConfClient *client;
+
+        client = gconf_client_get_default ();
+        use_compiz = gconf_client_get_bool (client, KEY_WM_USE_COMPIZ, NULL);
+        g_object_unref (client);
+        if (use_compiz) {
+                if (launch_compiz (session)) {
+                        return;
+                }
         }
+
+        launch_metacity (session);
 }
 
 static void

Modified: trunk/gui/simple-greeter/gdm-simple-greeter.schemas.in
==============================================================================
--- trunk/gui/simple-greeter/gdm-simple-greeter.schemas.in	(original)
+++ trunk/gui/simple-greeter/gdm-simple-greeter.schemas.in	Mon Mar 17 17:59:40 2008
@@ -56,6 +56,17 @@
         <long>Set to TRUE to disable showing the accessibility button in the login window.</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/apps/gdm/simple-greeter/wm_use_compiz</key>
+      <applyto>/apps/gdm/simple-greeter/wm_use_compiz</applyto>
+      <owner>gdm-simple-greeter</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Use compiz as the window manager</short>
+        <long>Set to true to use compiz as the window manager.</long>
+      </locale>
+    </schema>
 
 
     <schema>