SHA256
1
0
forked from pool/gdm

Accepting request 45055 from GNOME:Factory

checked in (request 45055)

OBS-URL: https://build.opensuse.org/request/show/45055
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=136
This commit is contained in:
OBS User autobuild
2010-08-09 21:51:56 +00:00
committed by Git OBS Bridge
parent a6ba424bba
commit a83db73e06
13 changed files with 450 additions and 289 deletions

View File

@@ -1,8 +1,8 @@
Index: gdm-2.30.4/daemon/gdm-session-direct.c
Index: gdm-2.29.5/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 @@
--- 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>
@@ -11,18 +11,19 @@ Index: gdm-2.30.4/daemon/gdm-session-direct.c
#include "gdm-session-direct.h"
#include "gdm-session.h"
#include "gdm-session-private.h"
@@ -662,6 +664,14 @@ get_fallback_session_name (GdmSessionDir
}
}
@@ -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)) {
+ g_free (session_direct->priv->fallback_session_name);
+ session_direct->priv->fallback_session_name = name;
+ goto out;
+ return name;
+ }
+
+ if (name) {
+ g_free (name);
+ }
+ g_free (name);
+
name = g_strdup ("gnome");
if (get_session_command_for_name (name, NULL)) {
g_free (session_direct->priv->fallback_session_name);
return name;