rpms/gdm/devel gdm-2.6.0.7-wait-for-bootup.patch,1.5,1.6

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	gdm-2.6.0.7-wait-for-bootup.patch 
Log Message:
Compile fixes


gdm-2.6.0.7-wait-for-bootup.patch:
 daemon/gdm.c          |   12 ++++
 daemon/gdm.h          |    8 ++
 daemon/slave.c        |  135 +++++++++++++++++++++++++++++++++++++++++++-------
 daemon/slave.h        |    3 +
 daemon/verify-pam.c   |    7 ++
 gui/greeter/greeter.c |    9 ++-
 6 files changed, 152 insertions(+), 22 deletions(-)

Index: gdm-2.6.0.7-wait-for-bootup.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.6.0.7-wait-for-bootup.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdm-2.6.0.7-wait-for-bootup.patch	15 Apr 2005 17:00:36 -0000	1.5
+++ gdm-2.6.0.7-wait-for-bootup.patch	15 Apr 2005 17:33:34 -0000	1.6
@@ -1,5 +1,5 @@
 --- gdm-2.6.0.8/daemon/gdm.c.wait-for-bootup	2005-03-07 15:40:10.000000000 -0500
-+++ gdm-2.6.0.8/daemon/gdm.c	2005-04-15 12:57:41.536651000 -0400
++++ gdm-2.6.0.8/daemon/gdm.c	2005-04-15 13:30:50.000000000 -0400
 @@ -100,6 +100,7 @@
  pid_t gdm_main_pid = 0;		/* PID of the main daemon */
  
@@ -48,7 +48,7 @@
  		            strlen (GDM_SOP_WRITE_X_SERVERS " ")) == 0) {
  		GdmDisplay *d;
 --- gdm-2.6.0.8/daemon/slave.h.wait-for-bootup	2004-05-06 18:33:41.000000000 -0400
-+++ gdm-2.6.0.8/daemon/slave.h	2005-04-15 12:57:41.541647000 -0400
++++ gdm-2.6.0.8/daemon/slave.h	2005-04-15 13:30:50.000000000 -0400
 @@ -41,6 +41,9 @@
  /* This is the slave child handler so that we can chain to it from elsewhere */
  void	 gdm_slave_child_handler (int sig);
@@ -59,8 +59,8 @@
  #endif /* GDM_SLAVE_H */
  
  /* EOF */
---- gdm-2.6.0.8/daemon/gdm.h.wait-for-bootup	2005-04-15 12:57:41.498689000 -0400
-+++ gdm-2.6.0.8/daemon/gdm.h	2005-04-15 12:57:41.548638000 -0400
+--- gdm-2.6.0.8/daemon/gdm.h.wait-for-bootup	2005-04-15 13:30:50.000000000 -0400
++++ gdm-2.6.0.8/daemon/gdm.h	2005-04-15 13:30:50.000000000 -0400
 @@ -115,6 +115,7 @@
  #define GDM_INTERRUPT_SELECT_USER 'U'
  #define GDM_INTERRUPT_LOGIN_SOUND 'L'
@@ -94,8 +94,8 @@
  
 -/* EOF */
 +
---- gdm-2.6.0.8/daemon/slave.c.wait-for-bootup	2005-04-15 12:57:41.510676000 -0400
-+++ gdm-2.6.0.8/daemon/slave.c	2005-04-15 12:57:41.565623000 -0400
+--- gdm-2.6.0.8/daemon/slave.c.wait-for-bootup	2005-04-15 13:30:50.000000000 -0400
++++ gdm-2.6.0.8/daemon/slave.c	2005-04-15 13:30:50.000000000 -0400
 @@ -26,6 +26,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -337,10 +337,18 @@
  		return FALSE;
  	return TRUE;
  }
---- gdm-2.6.0.8/daemon/verify-pam.c.wait-for-bootup	2005-04-15 12:57:41.573613000 -0400
-+++ gdm-2.6.0.8/daemon/verify-pam.c	2005-04-15 12:57:41.586601000 -0400
-@@ -767,7 +767,8 @@
-     gdm_login_is_canceled = FALSE;
+--- gdm-2.6.0.8/daemon/verify-pam.c.wait-for-bootup	2005-03-07 15:40:10.000000000 -0500
++++ gdm-2.6.0.8/daemon/verify-pam.c	2005-04-15 13:32:34.000000000 -0400
+@@ -57,6 +57,7 @@
+ extern gboolean GdmDisplayLastLogin;
+ extern uid_t GdmUserId;
+ extern gid_t GdmGroupId;
++extern gboolean gdm_wait_for_bootup;
+ 
+ extern gboolean no_console;
+ 
+@@ -740,7 +741,8 @@
+     null_tok = 0;
  
      /* start the timer for timed logins */
 -    if ( ! ve_string_empty (GdmTimedLogin) &&
@@ -349,7 +357,7 @@
  	(local || GdmAllowRemoteAutoLogin)) {
  	    gdm_slave_greeter_ctl_no_ret (GDM_STARTTIMER, "");
  	    started_timer = TRUE;
-@@ -1159,6 +1160,9 @@
+@@ -1116,6 +1118,9 @@
  
      cur_gdm_disp = d;
  
@@ -360,7 +368,7 @@
      extra_standalone_message = g_strdup_printf ("%s (%s)",
  						_("Automatic login"),
 --- gdm-2.6.0.8/gui/greeter/greeter.c.wait-for-bootup	2005-03-04 14:55:38.000000000 -0500
-+++ gdm-2.6.0.8/gui/greeter/greeter.c	2005-04-15 12:57:41.579608000 -0400
++++ gdm-2.6.0.8/gui/greeter/greeter.c	2005-04-15 13:30:50.000000000 -0400
 @@ -569,9 +569,15 @@
  static gboolean
  key_press_event (GtkWidget *widget, GdkEventKey *key, gpointer data)