gdm r6255 - in trunk: . daemon

[bcameron svn gnome org]

Author: bcameron
Date: Tue Jun  3 21:16:37 2008
New Revision: 6255
URL: http://svn.gnome.org/viewvc/gdm?rev=6255&view=rev

Log:
2008-06-03  Brian Cameron  <brian cameron sun com>

        * daemon/gdm-factory-slave.c, daemon/gdm-simple-slave.c,
          daemon/gdm-xdmcp-chooser-slave:  Now support PostLogin,
          PreSession, and PostSession hooks.  Approval by Ray Strode.
          Fixes bug #536371.


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	Tue Jun  3 21:16:37 2008
@@ -489,7 +489,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/Default", "gdm");
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "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	Tue Jun  3 21:16:37 2008
@@ -99,8 +99,14 @@
                     int               pid,
                     GdmSimpleSlave   *slave)
 {
+        char *username;
+
         g_debug ("GdmSimpleSlave: session started %d", pid);
 
+        /* Run the PreSession script. gdmslave suspends until script has terminated */
+        username = gdm_session_direct_get_username (slave->priv->session);
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PreSession", username);
+
         /* FIXME: should we do something here? */
 }
 
@@ -109,8 +115,14 @@
                    int             exit_code,
                    GdmSimpleSlave *slave)
 {
+        char *username;
+
         g_debug ("GdmSimpleSlave: session exited with code %d\n", exit_code);
 
+        /* Run the PostSession script. gdmslave suspends until script has terminated */
+        username = gdm_session_direct_get_username (slave->priv->session);
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PostSession", username);
+
         gdm_slave_stopped (GDM_SLAVE (slave));
 }
 
@@ -353,6 +365,9 @@
                        GdmSimpleSlave *slave)
 {
         queue_start_session (slave);
+
+        /* Run the PostLogin script. gdmslave suspends until script has terminated */
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PostLogin", "gdm");
 }
 
 static void
@@ -840,7 +855,7 @@
         }
 
         /* Run the init script. gdmslave suspends until script has terminated */
-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init/Default", "gdm");
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "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	Tue Jun  3 21:16:37 2008
@@ -190,7 +190,7 @@
         }
 
         /* Run the init script. gdmslave suspends until script has terminated */
-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init/Default", "gdm");
+        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", "gdm");
 
         slave->priv->chooser_server = gdm_chooser_server_new (display_id);
         g_signal_connect (slave->priv->chooser_server,