summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--daemon/gdm-session.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index ca7d98f1..5ef67fe5 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -319,18 +319,18 @@ on_establish_credentials_cb (GdmDBusWorker *proxy,
service_name = g_strdup (conversation->service_name);
if (worked) {
- if (self->user_verifier_interface != NULL) {
- gdm_dbus_user_verifier_emit_verification_complete (self->user_verifier_interface,
- service_name);
- g_signal_emit (self, signals[VERIFICATION_COMPLETE], 0, service_name);
- }
-
switch (self->verification_mode) {
case GDM_SESSION_VERIFICATION_MODE_LOGIN:
case GDM_SESSION_VERIFICATION_MODE_CHOOSER:
gdm_session_open_session (self, service_name);
break;
case GDM_SESSION_VERIFICATION_MODE_REAUTHENTICATE:
+ if (self->user_verifier_interface != NULL) {
+ gdm_dbus_user_verifier_emit_verification_complete (self->user_verifier_interface,
+ service_name);
+ g_signal_emit (self, signals[VERIFICATION_COMPLETE], 0, service_name);
+ }
+ break;
default:
break;
}
@@ -863,17 +863,17 @@ on_opened (GdmDBusWorker *worker,
conversation->session_id = g_strdup (session_id);
- if (self->greeter_interface != NULL) {
- gdm_dbus_greeter_emit_session_opened (self->greeter_interface,
- service_name);
- }
-
if (self->user_verifier_interface != NULL) {
gdm_dbus_user_verifier_emit_verification_complete (self->user_verifier_interface,
service_name);
g_signal_emit (self, signals[VERIFICATION_COMPLETE], 0, service_name);
}
+ if (self->greeter_interface != NULL) {
+ gdm_dbus_greeter_emit_session_opened (self->greeter_interface,
+ service_name);
+ }
+
g_debug ("GdmSession: Emitting 'session-opened' signal");
g_signal_emit (self, signals[SESSION_OPENED], 0, service_name, session_id);
} else {