summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2010-06-29 14:13:35 -0400
committerRay Strode <rstrode@redhat.com>2011-03-08 01:22:13 -0500
commitdd68dae4d4e06a5a8211625f5b23cef9661978b1 (patch)
tree3670c3b08ed6d301f0e6f52c0aeecc2cdd3d0a85 /gui
parent7f4a779aa7d0e612db668f052fec5dac15a2f0bb (diff)
downloadgdm-dd68dae4d4e06a5a8211625f5b23cef9661978b1.tar.gz
Show cancel button after first message
Not all PAM modules ask for input at the keyboard. We need to show the cancel button after the first message even if that message isn't asking for input.
Diffstat (limited to 'gui')
-rw-r--r--gui/simple-greeter/gdm-greeter-login-window.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
index acfab5a8..f653b962 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -682,6 +682,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window,
switch_mode (login_window, dialog_mode);
}
+ gtk_widget_set_sensitive (login_window->priv->conversation_list, TRUE);
set_sensitive (login_window, TRUE);
set_ready (login_window);
set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
@@ -762,6 +763,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
g_debug ("GdmGreeterLoginWindow: info: %s", text);
set_message (GDM_GREETER_LOGIN_WINDOW (login_window), text);
+ maybe_show_cancel_button (login_window);
return TRUE;
}
@@ -773,6 +775,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
g_debug ("GdmGreeterLoginWindow: problem: %s", text);
+ maybe_show_cancel_button (login_window);
set_message (GDM_GREETER_LOGIN_WINDOW (login_window), text);
gdk_window_beep (gtk_widget_get_window (GTK_WIDGET (login_window)));