gdm r5726 - in trunk: . gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Thu Feb  7 22:31:02 2008
New Revision: 5726
URL: http://svn.gnome.org/viewvc/gdm?rev=5726&view=rev

Log:
2008-02-07  Ray Strode  <rstrode redhat com>

	Make sure the user never sees the string "Prompt: "

	* gui/simple-greeter/gdm-greeter-login-window.c
	(switch_mode):
	(gdm_greeter_login_window_{secret,}info_query):
	Don't show auth input hbox as soon as going into
	authentication mode
	explicitly show the auth input hbox when pam
	asks for input.
	* gui/simple-greeter/gdm-greeter-login-window.glade:
	drop the string "Prompt:" entirely


Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-greeter-login-window.c
   trunk/gui/simple-greeter/gdm-greeter-login-window.glade

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.c	Thu Feb  7 22:31:02 2008
@@ -253,7 +253,6 @@
                 show_widget (login_window, "restart-button", FALSE);
                 show_widget (login_window, "suspend-button", FALSE);
                 show_widget (login_window, "disconnect-button", FALSE);
-                show_widget (login_window, "auth-input-box", TRUE);
                 default_name = "log-in-button";
                 break;
         default:
@@ -399,6 +398,7 @@
         label = glade_xml_get_widget (GDM_GREETER_LOGIN_WINDOW (login_window)->priv->xml, "auth-prompt-label");
         gtk_label_set_text (GTK_LABEL (label), text);
 
+        show_widget (login_window, "auth-input-box", TRUE);
         set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
         set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
         set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
@@ -422,6 +422,7 @@
         label = glade_xml_get_widget (GDM_GREETER_LOGIN_WINDOW (login_window)->priv->xml, "auth-prompt-label");
         gtk_label_set_text (GTK_LABEL (label), text);
 
+        show_widget (login_window, "auth-input-box", TRUE);
         set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
         set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
         set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.glade
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.glade	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.glade	Thu Feb  7 22:31:02 2008
@@ -116,7 +116,7 @@
                     <child>
                       <widget class="GtkLabel" id="auth-prompt-label">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Prompt:</property>
+                        <property name="label" translatable="yes"></property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>