4083398e2e
Pushing from G:N; package is fine with me now; just not sure the two patches I rebased work ;-) OBS-URL: https://build.opensuse.org/request/show/133693 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=217
29 lines
916 B
Diff
29 lines
916 B
Diff
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
|
|
index 90b9045..f2ea011 100644
|
|
--- a/daemon/gdm-session.c
|
|
+++ b/daemon/gdm-session.c
|
|
@@ -43,6 +43,8 @@
|
|
#include <glib-object.h>
|
|
#include <gio/gio.h>
|
|
|
|
+#include "gdm-sysconfig.h"
|
|
+
|
|
#include "gdm-session.h"
|
|
#include "gdm-session-glue.h"
|
|
#include "gdm-dbus-util.h"
|
|
@@ -518,6 +520,14 @@ get_fallback_session_name (GdmSession *self)
|
|
}
|
|
}
|
|
|
|
+ name = gdm_sysconfig_load_value ("/etc/sysconfig/windowmanager", "DEFAULT_WM");
|
|
+ if (name && get_session_command_for_name (name, NULL)) {
|
|
+ g_free (self->priv->fallback_session_name);
|
|
+ self->priv->fallback_session_name = name;
|
|
+ goto out;
|
|
+ }
|
|
+ g_free (name);
|
|
+
|
|
name = g_strdup ("gnome");
|
|
if (get_session_command_for_name (name, NULL)) {
|
|
g_free (self->priv->fallback_session_name);
|