[gdm/multi-stack: 34/35] Don't send auth-failed when worker dies



commit c4ebe26db9c963d587694d0197e145e086ec43ca
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 |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 2899ea2..689e4cf 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;
 
@@ -1761,9 +1760,7 @@ worker_exited (GdmSessionWorkerJob *job,
         g_debug ("GdmSessionDirect: Worker job exited: %d", code);
 
         g_object_ref (conversation);
-        if (!conversation->session->priv->is_authenticated) {
-                _gdm_session_authentication_failed (GDM_SESSION (conversation->session), NULL);
-        } else if (conversation->session->priv->is_running) {
+        if (conversation->session->priv->is_running) {
                 _gdm_session_session_exited (GDM_SESSION (conversation->session), code);
         }
 
@@ -1781,9 +1778,7 @@ worker_died (GdmSessionWorkerJob *job,
         g_debug ("GdmSessionDirect: Worker job died: %d", signum);
 
         g_object_ref (conversation);
-        if (!conversation->session->priv->is_authenticated) {
-                _gdm_session_authentication_failed (GDM_SESSION (conversation->session), NULL);
-        } else if (conversation->session->priv->is_running) {
+        if (conversation->session->priv->is_running) {
                 _gdm_session_session_died (GDM_SESSION (conversation->session), signum);
         }
 
@@ -2398,7 +2393,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]