gdm r5828 - in trunk: . daemon

[halfline svn gnome org]

Author: halfline
Date: Wed Feb 20 21:32:23 2008
New Revision: 5828
URL: http://svn.gnome.org/viewvc/gdm?rev=5828&view=rev

Log:
2008-02-20  Ray Strode  <rstrode redhat com>

	* daemon/gdm-factory-slave.c
	(run_greeter):
	* daemon/gdm-simple-slave.c
	(run_greeter):
	* daemon/gdm-xdmcp-chooser-slave.c:
	(run_chooser):
	Run /etc/gdm/Init/Default, not /etc/gdm/Init.
	We should probably run the per-display scripts,
	too.


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

Modified: trunk/daemon/gdm-factory-slave.c
==============================================================================
--- trunk/daemon/gdm-factory-slave.c	(original)
+++ trunk/daemon/gdm-factory-slave.c	Wed Feb 20 21:32:23 2008
@@ -481,7 +481,7 @@
         /* FIXME: send a signal back to the master */
 
         /* Run the init script. gdmslave suspends until script has terminated */
-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "gdm");
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init/Default", "gdm");
 
         slave->priv->greeter_server = gdm_greeter_server_new (display_id);
         g_signal_connect (slave->priv->greeter_server,

Modified: trunk/daemon/gdm-simple-slave.c
==============================================================================
--- trunk/daemon/gdm-simple-slave.c	(original)
+++ trunk/daemon/gdm-simple-slave.c	Wed Feb 20 21:32:23 2008
@@ -721,7 +721,7 @@
         }
 
         /* Run the init script. gdmslave suspends until script has terminated */
-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "gdm");
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init/Default", "gdm");
 
         create_new_session (slave);
 

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 20 21:32:23 2008
@@ -190,7 +190,7 @@
         }
 
         /* Run the init script. gdmslave suspends until script has terminated */
-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "gdm");
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init/Default", "gdm");
 
         slave->priv->chooser_server = gdm_chooser_server_new (display_id);
         g_signal_connect (slave->priv->chooser_server,