diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-02-17 01:08:56 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-02-17 01:08:56 +0000 |
| commit | dd2e9560ebce1994885ab4ea62c05afc6e01c660 (patch) | |
| tree | f58a2861f491691bff29627cb0dd1dc081f2499c /gui | |
| parent | cc4ec0e1539254010862c1ebaf39b9b2e63f5eee (diff) | |
| download | gdm-dd2e9560ebce1994885ab4ea62c05afc6e01c660.tar.gz | |
Fix face browser so it works better. Sometimes we get PROMPT calls for
2006-02-16 Brian Cameron <brian.cameron@sun.com>
* gui/greeter/greeter.c, gui/greeter/greeter_item_ulist.c: Fix
face browser so it works better. Sometimes we get PROMPT calls
for displaying username so we want to enable the face browser
in this case. We only want to disable it when the cancel
button is pressed (until the next time the daemon prompts us
for username/password entry). Also fix "theme broken" message
so it doesn't display the message when the pam-message label is
in the theme.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/greeter/greeter.c | 1 | ||||
| -rw-r--r-- | gui/greeter/greeter_item_ulist.c | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gui/greeter/greeter.c b/gui/greeter/greeter.c index 89ad4b4a..ecf7edb3 100644 --- a/gui/greeter/greeter.c +++ b/gui/greeter/greeter.c @@ -179,6 +179,7 @@ greeter_ctrl_handler (GIOChannel *source, greeter_probably_login_prompt = FALSE; } greeter_ignore_buttons (FALSE); + greeter_item_ulist_enable (); greeter_item_pam_prompt (tmp, PW_ENTRY_SIZE, TRUE); g_free (tmp); break; diff --git a/gui/greeter/greeter_item_ulist.c b/gui/greeter/greeter_item_ulist.c index 57f54b34..3fc05c7f 100644 --- a/gui/greeter/greeter_item_ulist.c +++ b/gui/greeter/greeter_item_ulist.c @@ -178,18 +178,17 @@ user_selected (GtkTreeSelection *selection, gpointer data) gtk_tree_model_get (tm, &iter, GREETER_ULIST_LOGIN_COLUMN, &login, -1); if (login != NULL) { - GreeterItemInfo *pamlabel; - if (selecting_user && greeter_probably_login_prompt) { gtk_entry_set_text (GTK_ENTRY (pam_entry), login); } - pamlabel = greeter_lookup_id ("pam-message"); - if (selecting_user && pamlabel != NULL) { + if (selecting_user) { + GreeterItemInfo *pamlabel = greeter_lookup_id ("pam-message"); + if (pamlabel != NULL) { + gdm_common_warning ("Theme broken: must have pam-message label!"); + } printf ("%c%c%c%s\n", STX, BEL, GDM_INTERRUPT_SELECT_USER, login); fflush (stdout); - } else { - gdm_common_warning ("Theme broken: must have pam-message label!"); } } } |