|
 |
75a7a3 |
From 7eae5842599eca46e14d57641f6629c60fe7a354 Mon Sep 17 00:00:00 2001
|
|
|
75a7a3 |
From: Ray Strode <rstrode@redhat.com>
|
|
|
75a7a3 |
Date: Fri, 31 Mar 2017 14:56:46 -0400
|
|
|
75a7a3 |
Subject: [PATCH 04/13] manager: drop some erroneous code
|
|
|
75a7a3 |
|
|
|
75a7a3 |
This is commit 82296a3350b64d0ed5ae3b9f6983466c60dd8a53 all over
|
|
|
75a7a3 |
again. The code snuck back in during a refactor !
|
|
|
75a7a3 |
---
|
|
|
75a7a3 |
daemon/gdm-manager.c | 18 ------------------
|
|
|
75a7a3 |
1 file changed, 18 deletions(-)
|
|
|
75a7a3 |
|
|
|
75a7a3 |
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
|
|
|
75a7a3 |
index e78228b4..3014dad3 100644
|
|
|
75a7a3 |
--- a/daemon/gdm-manager.c
|
|
|
75a7a3 |
+++ b/daemon/gdm-manager.c
|
|
|
75a7a3 |
@@ -1903,79 +1903,61 @@ on_session_client_connected (GdmSession *session,
|
|
|
75a7a3 |
}
|
|
|
75a7a3 |
#endif
|
|
|
75a7a3 |
|
|
|
75a7a3 |
g_object_get (G_OBJECT (display), "allow-timed-login", &allow_timed_login, NULL);
|
|
|
75a7a3 |
|
|
|
75a7a3 |
if (!allow_timed_login) {
|
|
|
75a7a3 |
return;
|
|
|
75a7a3 |
}
|
|
|
75a7a3 |
|
|
|
75a7a3 |
enabled = get_timed_login_details (manager, &username, &delay);
|
|
|
75a7a3 |
|
|
|
75a7a3 |
if (! enabled) {
|
|
|
75a7a3 |
return;
|
|
|
75a7a3 |
}
|
|
|
75a7a3 |
|
|
|
75a7a3 |
gdm_session_set_timed_login_details (session, username, delay);
|
|
|
75a7a3 |
|
|
|
75a7a3 |
g_debug ("GdmManager: Starting automatic login conversation (for timed login)");
|
|
|
75a7a3 |
gdm_session_start_conversation (session, "gdm-autologin");
|
|
|
75a7a3 |
|
|
|
75a7a3 |
g_free (username);
|
|
|
75a7a3 |
|
|
|
75a7a3 |
}
|
|
|
75a7a3 |
|
|
|
75a7a3 |
static void
|
|
|
75a7a3 |
on_session_client_disconnected (GdmSession *session,
|
|
|
75a7a3 |
GCredentials *credentials,
|
|
|
75a7a3 |
GPid pid_of_client,
|
|
|
75a7a3 |
GdmManager *manager)
|
|
|
75a7a3 |
{
|
|
|
75a7a3 |
- GdmDisplay *display;
|
|
|
75a7a3 |
- gboolean display_is_local;
|
|
|
75a7a3 |
-
|
|
|
75a7a3 |
g_debug ("GdmManager: client disconnected");
|
|
|
75a7a3 |
-
|
|
|
75a7a3 |
- display = get_display_for_user_session (session);
|
|
|
75a7a3 |
-
|
|
|
75a7a3 |
- if (display == NULL) {
|
|
|
75a7a3 |
- return;
|
|
|
75a7a3 |
- }
|
|
|
75a7a3 |
-
|
|
|
75a7a3 |
- g_object_get (G_OBJECT (display),
|
|
|
75a7a3 |
- "is-local", &display_is_local,
|
|
|
75a7a3 |
- NULL);
|
|
|
75a7a3 |
-
|
|
|
75a7a3 |
- if ( ! display_is_local && gdm_session_is_running (session)) {
|
|
|
75a7a3 |
- gdm_display_unmanage (display);
|
|
|
75a7a3 |
- gdm_display_finish (display);
|
|
|
75a7a3 |
- }
|
|
|
75a7a3 |
}
|
|
|
75a7a3 |
|
|
|
75a7a3 |
typedef struct
|
|
|
75a7a3 |
{
|
|
|
75a7a3 |
GdmManager *manager;
|
|
|
75a7a3 |
GdmSession *session;
|
|
|
75a7a3 |
guint idle_id;
|
|
|
75a7a3 |
} ResetSessionOperation;
|
|
|
75a7a3 |
|
|
|
75a7a3 |
static void
|
|
|
75a7a3 |
destroy_reset_session_operation (ResetSessionOperation *operation)
|
|
|
75a7a3 |
{
|
|
|
75a7a3 |
g_object_set_data (G_OBJECT (operation->session),
|
|
|
75a7a3 |
"reset-session-operation",
|
|
|
75a7a3 |
NULL);
|
|
|
75a7a3 |
g_object_unref (operation->session);
|
|
|
75a7a3 |
g_slice_free (ResetSessionOperation, operation);
|
|
|
75a7a3 |
}
|
|
|
75a7a3 |
|
|
|
75a7a3 |
static gboolean
|
|
|
75a7a3 |
on_reset_session (ResetSessionOperation *operation)
|
|
|
75a7a3 |
{
|
|
|
75a7a3 |
gdm_session_reset (operation->session);
|
|
|
75a7a3 |
|
|
|
75a7a3 |
destroy_reset_session_operation (operation);
|
|
|
75a7a3 |
|
|
|
75a7a3 |
return G_SOURCE_REMOVE;
|
|
|
75a7a3 |
}
|
|
|
75a7a3 |
|
|
|
75a7a3 |
static void
|
|
|
75a7a3 |
--
|
|
|
75a7a3 |
2.12.0
|
|
|
75a7a3 |
|