rpms/gdm/devel gdm-2.6.0.5-wait-for-bootup.patch,1.2,1.3

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	gdm-2.6.0.5-wait-for-bootup.patch 
Log Message:
Fix patch overlap


gdm-2.6.0.5-wait-for-bootup.patch:
 daemon/gdm.c          |   10 ++++
 daemon/gdm.h          |    9 +++
 daemon/slave.c        |  121 +++++++++++++++++++++++++++++++++++++++++---------
 daemon/slave.h        |    3 +
 daemon/verify-pam.c   |   57 +++++++++++++++++++++--
 gui/greeter/greeter.c |    9 ++-
 6 files changed, 179 insertions(+), 30 deletions(-)

Index: gdm-2.6.0.5-wait-for-bootup.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.6.0.5-wait-for-bootup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdm-2.6.0.5-wait-for-bootup.patch	28 Mar 2005 20:21:06 -0000	1.2
+++ gdm-2.6.0.5-wait-for-bootup.patch	28 Mar 2005 20:26:29 -0000	1.3
@@ -219,20 +219,6 @@
  	    gdm_error (_("%s: Home directory for %s: '%s' does not exist!"),
  		       "gdm_slave_session_start",
  		       login,
-@@ -4306,7 +4369,12 @@
- #endif
- 
-     finish_session_output (run_post_session /* do_read */);
--    
-+
-+    /* If successfully exited then clear the log file
-+     */
-+    if (d->xsession_errors_filename != NULL)
-+	    VE_IGNORE_EINTR (unlink (d->xsession_errors_filename));
-+
-     if (local_login == NULL)
- 	    pwent = NULL;
-     else
 @@ -4707,6 +4775,8 @@
  				}
  			} else if (strcmp (&s[1], GDM_NOTIFY_GO) == 0) {