Accepting request 44873 from home:vuntz:branches:GNOME:Factory
Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 44873 revision 3. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44873 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=135
This commit is contained in:
committed by
Git OBS Bridge
parent
9a89393a30
commit
a6ba424bba
@@ -1,7 +1,7 @@
|
||||
Index: gdm-2.31.2/daemon/gdm-session-direct.c
|
||||
Index: gdm-2.30.4/daemon/gdm-session-direct.c
|
||||
===================================================================
|
||||
--- gdm-2.31.2.orig/daemon/gdm-session-direct.c
|
||||
+++ gdm-2.31.2/daemon/gdm-session-direct.c
|
||||
--- gdm-2.30.4.orig/daemon/gdm-session-direct.c
|
||||
+++ gdm-2.30.4/daemon/gdm-session-direct.c
|
||||
@@ -50,6 +50,8 @@
|
||||
#include <dbus/dbus-glib.h>
|
||||
#include <dbus/dbus-glib-lowlevel.h>
|
||||
@@ -11,18 +11,17 @@ Index: gdm-2.31.2/daemon/gdm-session-direct.c
|
||||
#include "gdm-session-direct.h"
|
||||
#include "gdm-session.h"
|
||||
#include "gdm-session-private.h"
|
||||
@@ -674,6 +676,15 @@ get_fallback_session_name (GdmSessionDir
|
||||
@@ -662,6 +664,14 @@ get_fallback_session_name (GdmSessionDir
|
||||
}
|
||||
}
|
||||
|
||||
+ 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);
|
||||
+ g_free (session_direct->priv->fallback_session_name);
|
||||
+ session_direct->priv->fallback_session_name = name;
|
||||
+ goto out;
|
||||
+ }
|
||||
+ g_free (name);
|
||||
+
|
||||
name = g_strdup ("gnome");
|
||||
if (get_session_command_for_name (name, NULL)) {
|
||||
|
Reference in New Issue
Block a user