diff options
-rw-r--r-- | daemon/gdm-manager.c | 20 | ||||
-rw-r--r-- | daemon/gdm-session.c | 6 | ||||
-rw-r--r-- | daemon/gdm-session.h | 1 |
3 files changed, 1 insertions, 26 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index 5c59dc91..f55d11e0 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -870,25 +870,7 @@ on_start_user_session (StartUserSessionOperation *operation) } display = get_display_for_user_session (operation->session); - - if (gdm_session_has_own_display_server (operation->session)) { - uid_t allowed_uid; - - g_debug ("GdmManager: session has its display server, reusing our server for another login screen"); - - /* The seed session is going to follow the session worker - * into the new display. Untie it from this display and - * create a new seed session for us. */ - allowed_uid = gdm_session_get_allowed_user (operation->session); - g_object_set_data (G_OBJECT (display), "gdm-seed-session", NULL); - g_object_set_data (G_OBJECT (operation->session), "gdm-display", NULL); - create_seed_session_for_display (operation->manager, display, allowed_uid); - } else { - /* In this case, the greeter's display is morphing into - * the user session display. Kill the greeter on this session - * and let the seed session follow the same display. */ - gdm_display_stop_greeter_session (display); - } + gdm_display_stop_greeter_session (display); start_user_session (operation->manager, operation); diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c index 45b8acc1..7b6b5e27 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c @@ -2691,12 +2691,6 @@ out: return bypasses_xsession; } -gboolean -gdm_session_has_own_display_server (GdmSession *self) -{ - return FALSE; -} - void gdm_session_select_program (GdmSession *self, const char *text) diff --git a/daemon/gdm-session.h b/daemon/gdm-session.h index 1d264f40..d953302b 100644 --- a/daemon/gdm-session.h +++ b/daemon/gdm-session.h @@ -111,7 +111,6 @@ const char *gdm_session_get_display_device (GdmSession *sessi const char *gdm_session_get_display_seat_id (GdmSession *session); const char *gdm_session_get_session_id (GdmSession *session); gboolean gdm_session_bypasses_xsession (GdmSession *session); -gboolean gdm_session_has_own_display_server (GdmSession *session); void gdm_session_start_conversation (GdmSession *session, const char *service_name); |