diff options
| author | Ray Strode <rstrode@redhat.com> | 2014-04-11 14:54:04 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2014-04-11 14:55:32 -0400 |
| commit | 0090cbf9c6a4bc0ed8baa7da907336246fe4fa1d (patch) | |
| tree | d1db02f8ddd0022cab9fab8731b2769baf3e44b5 | |
| parent | fc8106a4039d51759b28b7bfbc4613dfccfa7f01 (diff) | |
| download | gdm-wip/xinit-hack.tar.gz | |
session: make sure session display mode is set even if session isn'twip/xinit-hack
explicitly picked
| -rw-r--r-- | daemon/gdm-session.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c index 7dd13ba1..08091643 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c @@ -340,6 +340,8 @@ on_establish_credentials_cb (GdmDBusWorker *proxy, service_name = conversation->service_name; if (worked) { + GdmSessionDisplayMode mode; + switch (self->priv->verification_mode) { case GDM_SESSION_VERIFICATION_MODE_REAUTHENTICATE: if (self->priv->user_verifier_interface != NULL) { @@ -351,6 +353,10 @@ on_establish_credentials_cb (GdmDBusWorker *proxy, case GDM_SESSION_VERIFICATION_MODE_LOGIN: case GDM_SESSION_VERIFICATION_MODE_CHOOSER: + mode = gdm_session_get_display_mode (self); + gdm_dbus_worker_call_set_session_display_mode (conversation->worker_proxy, + gdm_session_display_mode_to_string (mode), + NULL, NULL, NULL); gdm_session_open_session (self, service_name); break; default: @@ -2843,7 +2849,6 @@ gdm_session_select_session (GdmSession *self, { GHashTableIter iter; gpointer key, value; - GdmSessionDisplayMode mode; g_free (self->priv->selected_session); @@ -2853,8 +2858,6 @@ gdm_session_select_session (GdmSession *self, self->priv->selected_session = g_strdup (text); } - mode = gdm_session_get_display_mode (self); - g_hash_table_iter_init (&iter, self->priv->conversations); while (g_hash_table_iter_next (&iter, &key, &value)) { GdmSessionConversation *conversation; @@ -2864,9 +2867,6 @@ gdm_session_select_session (GdmSession *self, gdm_dbus_worker_call_set_session_name (conversation->worker_proxy, get_session_name (self), NULL, NULL, NULL); - gdm_dbus_worker_call_set_session_display_mode (conversation->worker_proxy, - gdm_session_display_mode_to_string (mode), - NULL, NULL, NULL); } } |