SHA256
1
0
forked from pool/gdm
gdm/gdm-correct-ShowLocalGreeter-standalone-XDMCP-server.patch
Dominique Leuenberger bcba239a7a Accepting request 287921 from home:fcrozat:branches:GNOME:Factory
- Update gdm-sysconfig-settings.patch / X11-displaymanager-gdm: fix
  support for DISPLAYMANAGER_STARTS_XSERVER from
  /etc/sysconfig/displaymanager.
- Add gdm-correct-ShowLocalGreeter-standalone-XDMCP-server.patch:
  ensure ShowLocalGreeter configuration key is properly handled
  (bgo#743440).

OBS-URL: https://build.opensuse.org/request/show/287921
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=282
2015-02-27 10:39:04 +00:00

40 lines
1.3 KiB
Diff

From 1721403c8c16c62c1c814d5bbf7a01714680a3fd Mon Sep 17 00:00:00 2001
From: Maxime de Roucy <maxime.deroucy@gmail.com>
Date: Sat, 24 Jan 2015 15:12:16 +0100
Subject: [PATCH] correct ShowLocalGreeter (standalone XDMCP server)
Get the ShowLocalGreeter option from configuration file BEFORE launching
the gdm manager. In order to let the manager know if it have to launch a
local X server or not.
https://bugzilla.gnome.org/show_bug.cgi?id=743440
---
daemon/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/main.c b/daemon/main.c
index cdb41fa..848cf3c 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -448,8 +448,6 @@ on_name_acquired (GDBusConnection *bus,
g_debug ("Successfully connected to D-Bus");
- gdm_manager_start (manager);
-
show_local_greeter = TRUE;
gdm_settings_direct_get_boolean (GDM_KEY_SHOW_LOCAL_GREETER, &show_local_greeter);
gdm_manager_set_show_local_greeter (manager, show_local_greeter);
@@ -457,6 +455,8 @@ on_name_acquired (GDBusConnection *bus,
xdmcp_enabled = FALSE;
gdm_settings_direct_get_boolean (GDM_KEY_XDMCP_ENABLE, &xdmcp_enabled);
gdm_manager_set_xdmcp_enabled (manager, xdmcp_enabled);
+
+ gdm_manager_start (manager);
}
static void
--
1.8.5.6