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.

3 files changed, 17 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 87dbd467..b1051715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 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.
+
+2006-02-16  Brian Cameron  <brian.cameron@sun.com>
+
 	* daemon/gdmconfig.c, daemon/gdm-net.c, gui/gdmsetup.c:
 	  Fix some GCC C-99 compile issues.  Fixes bug #331450.
 	  Patch provided by Jens Granseur.
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!");
 			}
 		}
 	}