diff options
| author | David Liang <dliang@novell.com> | 2009-07-15 14:29:36 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2009-07-15 14:29:36 -0400 |
| commit | d9b2e7fc717caa071a890f711f620c96f19b09d1 (patch) | |
| tree | 4e172afa820c5aa035923637773781264523d365 | |
| parent | ce8f3317320f6c59fe30f7388635292861c77007 (diff) | |
| download | gdm-d9b2e7fc717caa071a890f711f620c96f19b09d1.tar.gz | |
Propagate PAM error messages up to user
Previously, some messages were getting dropped.
http://bugzilla.gnome.org/show_bug.cgi?id=574338
| -rw-r--r-- | daemon/gdm-session-direct.c | 10 | ||||
| -rw-r--r-- | daemon/gdm-simple-slave.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c index f7dc446e..4915ca5d 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -270,7 +270,7 @@ gdm_session_direct_handle_setup_failed (GdmSessionDirect *session, g_debug ("GdmSessionDirect: Emitting 'setup-failed' signal"); - _gdm_session_setup_failed (GDM_SESSION (session), NULL); + _gdm_session_setup_failed (GDM_SESSION (session), text); return DBUS_HANDLER_RESULT_HANDLED; } @@ -316,7 +316,7 @@ gdm_session_direct_handle_reset_failed (GdmSessionDirect *session, g_debug ("GdmSessionDirect: Emitting 'reset-failed' signal"); - _gdm_session_reset_failed (GDM_SESSION (session), NULL); + _gdm_session_reset_failed (GDM_SESSION (session), text); return DBUS_HANDLER_RESULT_HANDLED; } @@ -363,7 +363,7 @@ gdm_session_direct_handle_authentication_failed (GdmSessionDirect *session, g_debug ("GdmSessionDirect: Emitting 'authentication-failed' signal"); session->priv->is_authenticated = FALSE; - _gdm_session_authentication_failed (GDM_SESSION (session), NULL); + _gdm_session_authentication_failed (GDM_SESSION (session), text); return DBUS_HANDLER_RESULT_HANDLED; } @@ -408,7 +408,7 @@ gdm_session_direct_handle_authorization_failed (GdmSessionDirect *session, g_debug ("GdmSessionDirect: Emitting 'authorization-failed' signal"); - _gdm_session_authorization_failed (GDM_SESSION (session), NULL); + _gdm_session_authorization_failed (GDM_SESSION (session), text); return DBUS_HANDLER_RESULT_HANDLED; } @@ -453,7 +453,7 @@ gdm_session_direct_handle_accreditation_failed (GdmSessionDirect *session, g_debug ("GdmSessionDirect: Emitting 'accreditation-failed' signal"); - _gdm_session_accreditation_failed (GDM_SESSION (session), NULL); + _gdm_session_accreditation_failed (GDM_SESSION (session), text); return DBUS_HANDLER_RESULT_HANDLED; } diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 3a2623c0..948886fd 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -217,7 +217,7 @@ on_session_setup_failed (GdmSession *session, { if (slave->priv->greeter_server != NULL) { gdm_greeter_server_problem (slave->priv->greeter_server, - _("Unable to initialize login system")); + message != NULL ? message: _("Unable to initialize login system")); } destroy_session (slave); @@ -253,7 +253,7 @@ on_session_authentication_failed (GdmSession *session, { if (slave->priv->greeter_server != NULL) { gdm_greeter_server_problem (slave->priv->greeter_server, - _("Unable to authenticate user")); + message != NULL ? message : _("Unable to authenticate user")); } destroy_session (slave); queue_greeter_reset (slave); @@ -307,7 +307,7 @@ on_session_authorization_failed (GdmSession *session, { if (slave->priv->greeter_server != NULL) { gdm_greeter_server_problem (slave->priv->greeter_server, - _("Unable to authorize user")); + message != NULL ? message : _("Unable to authorize user")); } destroy_session (slave); |