[gdm/multi-stack] Don't send auth-failed when worker dies
- From: Ray Strode <halfline src gnome org>
- To: svn-commits-list gnome org
- Subject: [gdm/multi-stack] Don't send auth-failed when worker dies
- Date: Tue, 19 May 2009 11:20:07 -0400 (EDT)
commit f69d85f7a2bc48f9d319835ab17a9fd13b6c7f23
Author: Ray Strode <rstrode redhat com>
Date: Wed May 13 13:43:33 2009 -0400
Don't send auth-failed when worker dies
Authentication hasn't failed, it just got aborted before it
could. This prevents a crash that happens when switching
runlevels while the login screen is up.
---
daemon/gdm-session-direct.c | 18 ++----------------
1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 7173080..9010dde 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -87,7 +87,6 @@ struct _GdmSessionDirectPrivate
GList *pending_connections;
- guint32 is_authenticated : 1;
guint32 is_running : 1;
GPid session_pid;
@@ -1771,13 +1770,7 @@ worker_exited (GdmSessionWorkerJob *job,
g_debug ("GdmSessionDirect: Worker job exited: %d", code);
g_object_ref (conversation);
- if (!conversation->session->priv->is_authenticated) {
- char *msg;
-
- msg = g_strdup_printf (_("worker exited with status %d"), code);
- _gdm_session_authentication_failed (GDM_SESSION (conversation->session), conversation->service_name, msg);
- g_free (msg);
- } else if (conversation->session->priv->is_running) {
+ if (conversation->session->priv->is_running) {
_gdm_session_session_exited (GDM_SESSION (conversation->session), code);
}
@@ -1795,13 +1788,7 @@ worker_died (GdmSessionWorkerJob *job,
g_debug ("GdmSessionDirect: Worker job died: %d", signum);
g_object_ref (conversation);
- if (!conversation->session->priv->is_authenticated) {
- char *msg;
-
- msg = g_strdup_printf (_("worker exited with status %d"), signum);
- _gdm_session_authentication_failed (GDM_SESSION (conversation->session), conversation->service_name, msg);
- g_free (msg);
- } else if (conversation->session->priv->is_running) {
+ if (conversation->session->priv->is_running) {
_gdm_session_session_died (GDM_SESSION (conversation->session), signum);
}
@@ -2413,7 +2400,6 @@ gdm_session_direct_close (GdmSession *session)
g_hash_table_remove_all (impl->priv->environment);
- impl->priv->is_authenticated = FALSE;
impl->priv->is_running = FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]