|
 |
f517b81 |
From a3904bf5f9e6fe6bc3bb2ad9c856cf1361b8194d Mon Sep 17 00:00:00 2001
|
|
|
f517b81 |
From: Ray Strode <rstrode@redhat.com>
|
|
|
f517b81 |
Date: Mon, 1 Oct 2018 11:05:57 -0400
|
|
|
f517b81 |
Subject: [PATCH] manager: correct display confusion
|
|
|
f517b81 |
|
|
|
f517b81 |
commit c5c5bf1f reworked autologin and broke it.
|
|
|
f517b81 |
|
|
|
f517b81 |
This commit addresses the breakage by accessing
|
|
|
f517b81 |
the proper display variable.
|
|
|
f517b81 |
|
|
|
f517b81 |
Closes https://gitlab.gnome.org/GNOME/gdm/issues/426
|
|
|
f517b81 |
---
|
|
|
f517b81 |
daemon/gdm-manager.c | 4 ++--
|
|
|
f517b81 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
f517b81 |
|
|
|
f517b81 |
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
|
|
|
f517b81 |
index b1e9b68be..62a967389 100644
|
|
|
f517b81 |
--- a/daemon/gdm-manager.c
|
|
|
f517b81 |
+++ b/daemon/gdm-manager.c
|
|
|
f517b81 |
@@ -1662,62 +1662,62 @@ on_start_user_session (StartUserSessionOperation *operation)
|
|
|
f517b81 |
if (gdm_display_get_status (display) == GDM_DISPLAY_MANAGED) {
|
|
|
f517b81 |
g_debug ("GdmManager: closing down initial setup display");
|
|
|
f517b81 |
gdm_display_stop_greeter_session (display);
|
|
|
f517b81 |
gdm_display_unmanage (display);
|
|
|
f517b81 |
gdm_display_finish (display);
|
|
|
f517b81 |
}
|
|
|
f517b81 |
} else {
|
|
|
f517b81 |
g_debug ("GdmManager: session has its display server, reusing our server for another login screen");
|
|
|
f517b81 |
}
|
|
|
f517b81 |
|
|
|
f517b81 |
/* The user session is going to follow the session worker
|
|
|
f517b81 |
* into the new display. Untie it from this display and
|
|
|
f517b81 |
* create a new session for a future user login. */
|
|
|
f517b81 |
allowed_uid = gdm_session_get_allowed_user (operation->session);
|
|
|
f517b81 |
g_object_set_data (G_OBJECT (display), "gdm-user-session", NULL);
|
|
|
f517b81 |
g_object_set_data (G_OBJECT (operation->session), "gdm-display", NULL);
|
|
|
f517b81 |
create_user_session_for_display (operation->manager, display, allowed_uid);
|
|
|
f517b81 |
|
|
|
f517b81 |
/* Give the user session a new display object for bookkeeping purposes */
|
|
|
f517b81 |
create_display_for_user_session (operation->manager,
|
|
|
f517b81 |
operation->session,
|
|
|
f517b81 |
session_id);
|
|
|
f517b81 |
|
|
|
f517b81 |
|
|
|
f517b81 |
if (g_strcmp0 (operation->service_name, "gdm-autologin") == 0) {
|
|
|
f517b81 |
/* remove the unused prepared greeter display since we're not going
|
|
|
f517b81 |
* to have a greeter */
|
|
|
f517b81 |
gdm_display_store_remove (self->priv->display_store, display);
|
|
|
f517b81 |
g_object_unref (display);
|
|
|
f517b81 |
|
|
|
f517b81 |
- self->priv->automatic_login_display = g_object_get_data (G_OBJECT (operation->session), "gdm-display");
|
|
|
f517b81 |
- g_object_add_weak_pointer (G_OBJECT (display), (gpointer *) &self->priv->automatic_login_display);
|
|
|
f517b81 |
+ self->priv->automatic_login_display = g_object_get_data (G_OBJECT (operation->session), "gdm-display");
|
|
|
f517b81 |
+ g_object_add_weak_pointer (G_OBJECT (self->priv->automatic_login_display), (gpointer *) &self->priv->automatic_login_display);
|
|
|
f517b81 |
}
|
|
|
f517b81 |
}
|
|
|
f517b81 |
|
|
|
f517b81 |
start_user_session (operation->manager, operation);
|
|
|
f517b81 |
|
|
|
f517b81 |
out:
|
|
|
f517b81 |
return G_SOURCE_REMOVE;
|
|
|
f517b81 |
}
|
|
|
f517b81 |
|
|
|
f517b81 |
static void
|
|
|
f517b81 |
queue_start_user_session (GdmManager *manager,
|
|
|
f517b81 |
GdmSession *session,
|
|
|
f517b81 |
const char *service_name)
|
|
|
f517b81 |
{
|
|
|
f517b81 |
StartUserSessionOperation *operation;
|
|
|
f517b81 |
|
|
|
f517b81 |
operation = g_slice_new0 (StartUserSessionOperation);
|
|
|
f517b81 |
operation->manager = manager;
|
|
|
f517b81 |
operation->session = g_object_ref (session);
|
|
|
f517b81 |
operation->service_name = g_strdup (service_name);
|
|
|
f517b81 |
|
|
|
f517b81 |
operation->idle_id = g_idle_add ((GSourceFunc) on_start_user_session, operation);
|
|
|
f517b81 |
g_object_set_data (G_OBJECT (session), "start-user-session-operation", operation);
|
|
|
f517b81 |
}
|
|
|
f517b81 |
|
|
|
f517b81 |
static void
|
|
|
f517b81 |
start_user_session_if_ready (GdmManager *manager,
|
|
|
f517b81 |
GdmSession *session,
|
|
|
f517b81 |
const char *service_name)
|
|
|
f517b81 |
{
|
|
|
f517b81 |
--
|
|
|
f517b81 |
2.17.1
|
|
|
f517b81 |
|