gdm r5703 - in trunk: . daemon

[mccann svn gnome org]

Author: mccann
Date: Wed Feb  6 16:46:38 2008
New Revision: 5703
URL: http://svn.gnome.org/viewvc/gdm?rev=5703&view=rev

Log:
2008-02-06  William Jon McCann  <jmccann redhat com>

	* daemon/gdm-factory-slave.c: (idle_connect_to_display):
	* daemon/gdm-product-slave.c: (idle_connect_to_display):
	* daemon/gdm-simple-slave.c: (idle_connect_to_display):
	* daemon/gdm-slave.c: (gdm_slave_run_script):
	* daemon/gdm-xdmcp-chooser-slave.c: (idle_connect_to_display):
	* daemon/simple-slave-main.c: (main):
	Make sure we retry connecting to the xserver.  This also ensures
	that we reach the exit if we fail the max number of times.



Modified:
   trunk/ChangeLog
   trunk/daemon/gdm-factory-slave.c
   trunk/daemon/gdm-product-slave.c
   trunk/daemon/gdm-simple-slave.c
   trunk/daemon/gdm-slave.c
   trunk/daemon/gdm-xdmcp-chooser-slave.c
   trunk/daemon/simple-slave-main.c

Modified: trunk/daemon/gdm-factory-slave.c
==============================================================================
--- trunk/daemon/gdm-factory-slave.c	(original)
+++ trunk/daemon/gdm-factory-slave.c	Wed Feb  6 16:46:38 2008
@@ -574,6 +574,7 @@
                         g_warning ("Unable to connect to display after %d tries - bailing out", slave->priv->connection_attempts);
                         exit (1);
                 }
+                return TRUE;
         }
 
         return FALSE;

Modified: trunk/daemon/gdm-product-slave.c
==============================================================================
--- trunk/daemon/gdm-product-slave.c	(original)
+++ trunk/daemon/gdm-product-slave.c	Wed Feb  6 16:46:38 2008
@@ -322,6 +322,7 @@
                         g_warning ("Unable to connect to display after %d tries - bailing out", slave->priv->connection_attempts);
                         exit (1);
                 }
+                return TRUE;
         }
 
         return FALSE;

Modified: trunk/daemon/gdm-simple-slave.c
==============================================================================
--- trunk/daemon/gdm-simple-slave.c	(original)
+++ trunk/daemon/gdm-simple-slave.c	Wed Feb  6 16:46:38 2008
@@ -751,6 +751,7 @@
                         g_warning ("Unable to connect to display after %d tries - bailing out", slave->priv->connection_attempts);
                         exit (1);
                 }
+                return TRUE;
         }
 
         return FALSE;

Modified: trunk/daemon/gdm-slave.c
==============================================================================
--- trunk/daemon/gdm-slave.c	(original)
+++ trunk/daemon/gdm-slave.c	Wed Feb  6 16:46:38 2008
@@ -263,6 +263,7 @@
 
         script = g_build_filename (dir, slave->priv->display_name, NULL);
         if (g_access (script, R_OK | X_OK) != 0) {
+                g_debug ("GdmSlave: script %s not found; skipping", script);
                 g_free (script);
                 script = NULL;
         }
@@ -271,6 +272,7 @@
             slave->priv->display_hostname != NULL) {
                 script = g_build_filename (dir, slave->priv->display_hostname, NULL);
                 if (g_access (script, R_OK | X_OK) != 0) {
+                        g_debug ("GdmSlave: script %s not found; skipping", script);
                         g_free (script);
                         script = NULL;
                 }
@@ -298,12 +300,14 @@
         if (script == NULL) {
                 script = g_build_filename (dir, "Default", NULL);
                 if (g_access (script, R_OK | X_OK) != 0) {
+                        g_debug ("GdmSlave: script %s not found; skipping", script);
                         g_free (script);
                         script = NULL;
                 }
         }
 
         if (script == NULL) {
+                g_debug ("GdmSlave: no script found");
                 return TRUE;
         }
 

Modified: trunk/daemon/gdm-xdmcp-chooser-slave.c
==============================================================================
--- trunk/daemon/gdm-xdmcp-chooser-slave.c	(original)
+++ trunk/daemon/gdm-xdmcp-chooser-slave.c	Wed Feb  6 16:46:38 2008
@@ -260,6 +260,7 @@
                         g_warning ("Unable to connect to display after %d tries - bailing out", slave->priv->connection_attempts);
                         exit (1);
                 }
+                return TRUE;
         }
 
         return FALSE;

Modified: trunk/daemon/simple-slave-main.c
==============================================================================
--- trunk/daemon/simple-slave-main.c	(original)
+++ trunk/daemon/simple-slave-main.c	Wed Feb  6 16:46:38 2008
@@ -171,6 +171,9 @@
         g_option_context_parse (context, &argc, &argv, NULL);
         g_option_context_free (context);
 
+        /* For debugging */
+        /*sleep (10);*/
+
         connection = get_system_bus ();
         if (connection == NULL) {
                 goto out;