2010-08-08 05:25:41 +00:00
|
|
|
Index: gdm-2.30.4/daemon/gdm-session-direct.c
|
2009-09-28 16:08:57 +00:00
|
|
|
===================================================================
|
2010-08-08 05:25:41 +00:00
|
|
|
--- gdm-2.30.4.orig/daemon/gdm-session-direct.c
|
|
|
|
+++ gdm-2.30.4/daemon/gdm-session-direct.c
|
2010-08-08 03:19:09 +00:00
|
|
|
@@ -50,6 +50,8 @@
|
2010-01-18 14:27:14 +00:00
|
|
|
#include <dbus/dbus-glib.h>
|
|
|
|
#include <dbus/dbus-glib-lowlevel.h>
|
2009-09-28 16:08:57 +00:00
|
|
|
|
|
|
|
+#include "gdm-sysconfig.h"
|
|
|
|
+
|
|
|
|
#include "gdm-session-direct.h"
|
|
|
|
#include "gdm-session.h"
|
|
|
|
#include "gdm-session-private.h"
|
2010-08-08 05:25:41 +00:00
|
|
|
@@ -662,6 +664,14 @@ get_fallback_session_name (GdmSessionDir
|
2010-08-08 03:19:09 +00:00
|
|
|
}
|
|
|
|
}
|
2009-09-28 16:08:57 +00:00
|
|
|
|
|
|
|
+ name = gdm_sysconfig_load_value ("/etc/sysconfig/windowmanager", "DEFAULT_WM");
|
|
|
|
+ if (name && get_session_command_for_name (name, NULL)) {
|
2010-08-08 05:25:41 +00:00
|
|
|
+ g_free (session_direct->priv->fallback_session_name);
|
|
|
|
+ session_direct->priv->fallback_session_name = name;
|
|
|
|
+ goto out;
|
2009-09-28 16:08:57 +00:00
|
|
|
+ }
|
2010-08-08 05:25:41 +00:00
|
|
|
+ g_free (name);
|
2009-09-28 16:08:57 +00:00
|
|
|
+
|
|
|
|
name = g_strdup ("gnome");
|
|
|
|
if (get_session_command_for_name (name, NULL)) {
|
2010-08-08 03:19:09 +00:00
|
|
|
g_free (session_direct->priv->fallback_session_name);
|