diff options
Diffstat (limited to 'daemon/gdm-factory-slave.c')
| -rw-r--r-- | daemon/gdm-factory-slave.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c index 9e435f9f..158b6cb5 100644 --- a/daemon/gdm-factory-slave.c +++ b/daemon/gdm-factory-slave.c @@ -502,6 +502,7 @@ run_greeter (GdmFactorySlave *slave) char *display_id; char *display_name; char *seat_id; + char *session_id; char *display_device; char *display_hostname; char *auth_file; @@ -513,6 +514,7 @@ run_greeter (GdmFactorySlave *slave) display_id = NULL; display_name = NULL; seat_id = NULL; + session_id = NULL; auth_file = NULL; display_device = NULL; display_hostname = NULL; @@ -522,6 +524,7 @@ run_greeter (GdmFactorySlave *slave) "display-id", &display_id, "display-name", &display_name, "display-seat-id", &seat_id, + "display-session-id", &session_id, "display-hostname", &display_hostname, "display-x11-authority-file", &auth_file, NULL); @@ -579,6 +582,7 @@ run_greeter (GdmFactorySlave *slave) g_debug ("GdmFactorySlave: Creating greeter on %s %s", display_name, display_device); slave->priv->greeter = gdm_greeter_session_new (display_name, seat_id, + session_id, display_device, display_hostname, display_is_local); @@ -674,14 +678,12 @@ on_server_died (GdmServer *server, static gboolean gdm_factory_slave_run (GdmFactorySlave *slave) { - char *display_name; - char *auth_file; + char *display_id; gboolean display_is_local; g_object_get (slave, + "display-id", &display_id, "display-is-local", &display_is_local, - "display-name", &display_name, - "display-x11-authority-file", &auth_file, NULL); /* if this is local display start a server if one doesn't @@ -689,7 +691,7 @@ gdm_factory_slave_run (GdmFactorySlave *slave) if (display_is_local) { gboolean res; - slave->priv->server = gdm_server_new (display_name, auth_file); + slave->priv->server = gdm_server_new (display_id); g_signal_connect (slave->priv->server, "exited", G_CALLBACK (on_server_exited), @@ -721,8 +723,7 @@ gdm_factory_slave_run (GdmFactorySlave *slave) g_timeout_add (500, (GSourceFunc)idle_connect_to_display, slave); } - g_free (display_name); - g_free (auth_file); + g_free (display_id); return TRUE; } |