diff options
| author | Ray Strode <rstrode@redhat.com> | 2012-04-13 18:08:20 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-04-13 18:13:33 -0400 |
| commit | 4b5dbd3e6e41fbc5dfad87480a34fa1b8f305dd3 (patch) | |
| tree | a37a24b4f54a05228ceae4e2f7d199de1bb73f53 | |
| parent | 94743e025e16fae06e6bae7caa476325fd13948e (diff) | |
| download | gdm-4b5dbd3e6e41fbc5dfad87480a34fa1b8f305dd3.tar.gz | |
initial-setup: finish login after initial setup stops
gdm changed how login proceeded after the greeter stops,
since the initial-setup branch first came to be.
This commit adapts it to the latest way of doing things.
| -rw-r--r-- | daemon/gdm-simple-slave.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index f570ad81..82f86df3 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -1480,8 +1480,18 @@ on_setup_session_stop (GdmGreeterSession *greeter, g_debug ("GdmSimpleSlave: Setup stopped"); clear_initial_setup_request (slave); remove_initial_setup_user (slave); - gdm_slave_stopped (GDM_SLAVE (slave)); + + if (slave->priv->start_session_service_name == NULL) { + gdm_slave_stopped (GDM_SLAVE (slave)); + } else { + gdm_greeter_server_stop (slave->priv->greeter_server); + start_session (slave); + } + + g_object_unref (slave->priv->greeter); + slave->priv->greeter = NULL; } + static void run_initial_setup (GdmSimpleSlave *slave) { |