rpms/gdm/devel gdm-2.16.0-desensitize-entry.patch, NONE, 1.1 gdm.spec, 1.205, 1.206

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30324

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.16.0-desensitize-entry.patch 
Log Message:
- desensitize entry fields until pam asks for input, so if pam
  doesn't initially ask for input (like in smart card required mode)
  the user can't type something and confuse gdm (bug 201344)



gdm-2.16.0-desensitize-entry.patch:
 gdmlogin.c                 |    4 ++--
 greeter/greeter_item_pam.c |   19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

--- NEW FILE gdm-2.16.0-desensitize-entry.patch ---
--- gdm-2.16.0/gui/gdmlogin.c.desensitize-entry	2006-10-11 14:29:13.000000000 -0400
+++ gdm-2.16.0/gui/gdmlogin.c	2006-10-11 14:30:28.000000000 -0400
@@ -1763,8 +1763,8 @@
 	    curuser = NULL;
 	}
 
-	gtk_widget_set_sensitive (entry, TRUE);
-	gtk_widget_set_sensitive (ok_button, TRUE);
+	gtk_widget_set_sensitive (entry, FALSE);
+	gtk_widget_set_sensitive (ok_button, FALSE);
 	gtk_widget_set_sensitive (cancel_button, TRUE);
 
 	if (browser_ok && gdm_config_get_bool (GDM_KEY_BROWSER))
--- gdm-2.16.0/gui/greeter/greeter_item_pam.c.desensitize-entry	2006-10-11 14:28:02.000000000 -0400
+++ gdm-2.16.0/gui/greeter/greeter_item_pam.c	2006-10-11 14:23:31.000000000 -0400
@@ -270,11 +270,20 @@
     {
       entry = GNOME_CANVAS_WIDGET (entry_info->item)->widget;
       
-      gtk_entry_set_visibility (GTK_ENTRY (entry), entry_visible);
-      gtk_widget_set_sensitive (GTK_WIDGET (entry), TRUE);
-      gtk_entry_set_max_length (GTK_ENTRY (entry), entry_len);
-      gtk_entry_set_text (GTK_ENTRY (entry), "");
-      gtk_widget_grab_focus (entry);
+      if (message != NULL && strcmp (message, "") != 0) 
+        {
+          gtk_entry_set_visibility (GTK_ENTRY (entry), entry_visible);
+          gtk_widget_set_sensitive (GTK_WIDGET (entry), TRUE);
+          gtk_entry_set_max_length (GTK_ENTRY (entry), entry_len);
+          gtk_entry_set_text (GTK_ENTRY (entry), "");
+          gtk_widget_grab_focus (entry);
+        }
+      else
+        {
+          gtk_entry_set_visibility (GTK_ENTRY (entry), entry_visible);
+          gtk_entry_set_text (GTK_ENTRY (entry), "...");
+          gtk_widget_set_sensitive (GTK_WIDGET (entry), FALSE);
+        }
     }
 
   messages_to_give = FALSE;


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- gdm.spec	6 Oct 2006 14:41:37 -0000	1.205
+++ gdm.spec	13 Oct 2006 00:43:20 -0000	1.206
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.16.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -54,6 +54,8 @@
 
 Patch27: gdm-2.16.0-close.patch
 
+Patch28: gdm-2.16.0-desensitize-entry.patch
+
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
 Prereq: /usr/sbin/useradd
@@ -125,6 +127,7 @@
 %patch25 -p1 -b .indic-langs
 %patch26 -p1 -b .markup
 %patch27 -p1 -b .close
+%patch28 -p1 -b .desensitize-entry
 
 %build
 cp -f %{SOURCE1} config/gdm
@@ -312,6 +315,11 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Wed Oct 10 2006 Ray Strode <rstrode at redhat.com> - 1:2.16.0-13.fc6
+- desensitize entry fields until pam asks for input, so if pam
+  doesn't initially ask for input (like in smart card required mode)
+  the user can't type something and confuse gdm (bug 201344)
+
 * Fri Oct 6 2006 Ray Strode <rstrode at redhat.com> - 1:2.16.0-12.fc6
 - invoke standard X server with -br option to ensure we get a
   black root on startup