diff options
| author | Ray Strode <rstrode@redhat.com> | 2012-07-17 02:18:39 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-07-17 02:20:35 -0400 |
| commit | 4858d1410ba1febe13a022d20ed213bed75d4c66 (patch) | |
| tree | d8ea0d1a3904052674b76d7caee55637c2269c43 | |
| parent | 17b2af036ac0bd38e157ca79c28da28006646f51 (diff) | |
| download | gdm-4858d1410ba1febe13a022d20ed213bed75d4c66.tar.gz | |
simple-greeter: only hide Other item if we can skip it
Normally if "Other" is the only thing we'll show, we forgo it
and jump straight to the password prompt.
There is a bug, though, if multiple authentication methods are
enabled. In that case, we hide the user chooser, but don't jump
to the Password prompt.
This commit makes sure we show the user chooser / Other in that case.
| -rw-r--r-- | gui/simple-greeter/gdm-greeter-login-window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c index eeb36cbd..4ca83c75 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -1433,9 +1433,7 @@ on_users_loaded (GdmUserChooserWidget *user_chooser, update_banner_message (login_window); - if (!login_window->priv->user_list_disabled) { - gtk_widget_show (login_window->priv->user_chooser); - } + gtk_widget_show (login_window->priv->user_chooser); enable_waiting_extensions (login_window); @@ -1444,6 +1442,8 @@ on_users_loaded (GdmUserChooserWidget *user_chooser, request_timed_login (login_window); } else if (can_jump_to_authenticate (login_window)) { + gtk_widget_hide (login_window->priv->user_chooser); + /* jump straight to authenticate */ g_debug ("GdmGreeterLoginWindow: jumping straight to authenticate"); g_signal_emit (G_OBJECT (login_window), signals[USER_SELECTED], |