c1cb311d64
Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 29924 revision 5. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/29924 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=112
30 lines
914 B
Diff
30 lines
914 B
Diff
Index: gdm-2.29.5/daemon/gdm-session-direct.c
|
|
===================================================================
|
|
--- gdm-2.29.5.orig/daemon/gdm-session-direct.c
|
|
+++ gdm-2.29.5/daemon/gdm-session-direct.c
|
|
@@ -48,6 +48,8 @@
|
|
#include <dbus/dbus-glib.h>
|
|
#include <dbus/dbus-glib-lowlevel.h>
|
|
|
|
+#include "gdm-sysconfig.h"
|
|
+
|
|
#include "gdm-session-direct.h"
|
|
#include "gdm-session.h"
|
|
#include "gdm-session-private.h"
|
|
@@ -647,6 +649,15 @@ get_fallback_session_name (void)
|
|
int i;
|
|
char *name;
|
|
|
|
+ name = gdm_sysconfig_load_value ("/etc/sysconfig/windowmanager", "DEFAULT_WM");
|
|
+ if (name && get_session_command_for_name (name, NULL)) {
|
|
+ return name;
|
|
+ }
|
|
+
|
|
+ if (name) {
|
|
+ g_free (name);
|
|
+ }
|
|
+
|
|
name = g_strdup ("gnome");
|
|
if (get_session_command_for_name (name, NULL)) {
|
|
return name;
|