diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-02-20 21:32:23 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@src.gnome.org> | 2008-02-20 21:32:23 +0000 |
| commit | 3893532551b78f6adb1ed0029d9a5428cac3d4b0 (patch) | |
| tree | 25ab3cfea376c33204e0a4f44ea0a6052a0458d4 | |
| parent | 15adf442e886257ded983cfaeeaa9c28c78298cd (diff) | |
| download | gdm-3893532551b78f6adb1ed0029d9a5428cac3d4b0.tar.gz | |
Run /etc/gdm/Init/Default, not /etc/gdm/Init. We should probably run the
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.
svn path=/trunk/; revision=5828
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | daemon/gdm-factory-slave.c | 2 | ||||
| -rw-r--r-- | daemon/gdm-simple-slave.c | 2 | ||||
| -rw-r--r-- | daemon/gdm-xdmcp-chooser-slave.c | 2 |
4 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,15 @@ +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. + 2008-02-20 William Jon McCann <jmccann@redhat.com> * common/gdm-settings-keys.h: diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c index 14a1a689..95ed5bdf 100644 --- a/daemon/gdm-factory-slave.c +++ b/daemon/gdm-factory-slave.c @@ -481,7 +481,7 @@ run_greeter (GdmFactorySlave *slave) /* 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, diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 20813f85..ebc9982d 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -721,7 +721,7 @@ run_greeter (GdmSimpleSlave *slave) } /* 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); diff --git a/daemon/gdm-xdmcp-chooser-slave.c b/daemon/gdm-xdmcp-chooser-slave.c index d8b6bd1e..ecc00b21 100644 --- a/daemon/gdm-xdmcp-chooser-slave.c +++ b/daemon/gdm-xdmcp-chooser-slave.c @@ -190,7 +190,7 @@ run_chooser (GdmXdmcpChooserSlave *slave) } /* 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, |