rpms/gdm/devel gdm-2.15.6-fix-face-browser.patch, NONE, 1.1 gdm-2.15.5-reset-pam.patch, 1.1, 1.2 gdm.spec, 1.185, 1.186

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

Modified Files:
	gdm-2.15.5-reset-pam.patch gdm.spec 
Added Files:
	gdm-2.15.6-fix-face-browser.patch 
Log Message:
- fix face browser
  (http://bugzilla.gnome.org/show_bug.cgi?id=349640)
- fix error message reporting
  (http://bugzilla.gnome.org/show_bug.cgi?id=349758)


gdm-2.15.6-fix-face-browser.patch:
 greeter.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE gdm-2.15.6-fix-face-browser.patch ---
--- gdm-2.15.6/gui/greeter/greeter.c.dont-setup-io-channel-until-after-faces	2006-08-03 01:43:22.000000000 -0400
+++ gdm-2.15.6/gui/greeter/greeter.c	2006-08-03 01:44:29.000000000 -0400
@@ -1138,20 +1138,6 @@ main (int argc, char *argv[])
 	  gdm_common_fail_greeter ("Could not set signal mask!");
   }
   
-  if G_LIKELY (! DOING_GDM_DEVELOPMENT) {
-    ctrlch = g_io_channel_unix_new (STDIN_FILENO);
-    g_io_channel_set_encoding (ctrlch, NULL, NULL);
-    g_io_channel_set_buffered (ctrlch, TRUE);
-    g_io_channel_set_flags (ctrlch, 
-			    g_io_channel_get_flags (ctrlch) | G_IO_FLAG_NONBLOCK,
-			    NULL);
-    g_io_add_watch (ctrlch, 
-		    G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-		    (GIOFunc) greeter_ctrl_handler,
-		    NULL);
-    g_io_channel_unref (ctrlch);
-  }
-
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
   if G_UNLIKELY (DOING_GDM_DEVELOPMENT) {
@@ -1338,6 +1324,20 @@ main (int argc, char *argv[])
   
   greeter_setup_items ();
 
+  if G_LIKELY (! DOING_GDM_DEVELOPMENT) {
+    ctrlch = g_io_channel_unix_new (STDIN_FILENO);
+    g_io_channel_set_encoding (ctrlch, NULL, NULL);
+    g_io_channel_set_buffered (ctrlch, TRUE);
+    g_io_channel_set_flags (ctrlch, 
+			    g_io_channel_get_flags (ctrlch) | G_IO_FLAG_NONBLOCK,
+			    NULL);
+    g_io_add_watch (ctrlch, 
+		    G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+		    (GIOFunc) greeter_ctrl_handler,
+		    NULL);
+    g_io_channel_unref (ctrlch);
+  }
+
   gdm_common_setup_blinking ();
 
   gtk_widget_show_all (window);

gdm-2.15.5-reset-pam.patch:
 daemon/gdm.c          |    8 ++++++++
 daemon/gdm.h          |    4 ++++
 daemon/slave.c        |   34 +++++++++++++++++++++++++++-------
 gui/greeter/greeter.c |   18 +++++-------------
 4 files changed, 44 insertions(+), 20 deletions(-)

Index: gdm-2.15.5-reset-pam.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.5-reset-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.15.5-reset-pam.patch	7 Jul 2006 21:26:52 -0000	1.1
+++ gdm-2.15.5-reset-pam.patch	3 Aug 2006 07:10:32 -0000	1.2
@@ -168,10 +168,10 @@
 -	    g_free (tmp);
 -	  }
 -
++
 +	greeter_item_ulist_unset_selected_user ();
 +	greeter_item_pam_prompt ("", PW_ENTRY_SIZE, TRUE);
 +	greeter_item_pam_message ("");
-+	greeter_item_pam_error ("");
 + 
  	printf ("%c\n", STX);
  	fflush (stdout);


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- gdm.spec	22 Jul 2006 04:13:19 -0000	1.185
+++ gdm.spec	3 Aug 2006 07:10:32 -0000	1.186
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 13
+Release: 14%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -51,6 +51,7 @@
 Patch23: gdm-2.15.6-fix-setup-hang.patch
 Patch24: gdm-2.15.6-wtmp.patch
 Patch25: gdm-2.15.6-center-cursor.patch
+Patch26: gdm-2.15.6-fix-face-browser.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -135,6 +136,7 @@
 %patch23 -p1 -b .fix-setup-hang
 %patch24 -p1 -b .wtmp
 %patch25 -p1 -b .center-cursor
+%patch26 -p1 -b .fix-face-browser
 
 # fix the time format for ja
 perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po
@@ -330,6 +332,12 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Thu Aug 3 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-14
+- fix face browser
+  (http://bugzilla.gnome.org/show_bug.cgi?id=349640)
+- fix error message reporting
+  (http://bugzilla.gnome.org/show_bug.cgi?id=349758)
+
 * Fri Jul 21 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-13
 - simply all the security token code by only using one pam stack
 - drop lame kill on token removal feature