diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-10-11 18:19:06 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2007-10-11 18:19:06 +0000 |
| commit | 3573a91727af5e61e3ae93101c178cac75655bb7 (patch) | |
| tree | c8e33063290e15c1685ca8ff6983ac0d98ba6a11 /daemon/gdm-simple-slave.c | |
| parent | 5305d0acec5de7b03fa66c1f7ab0d56f86ef0057 (diff) | |
| download | gdm-3573a91727af5e61e3ae93101c178cac75655bb7.tar.gz | |
Also pass x11-display when opening the session. Patch from Brian Cameron
2007-10-11 William Jon McCann <mccann@jhu.edu>
* common/gdm-marshal.list:
* daemon/gdm-product-slave.c: (reset_session), (on_relay_open):
* daemon/gdm-session-worker.c: (gdm_session_worker_initialize_pam),
(gdm_session_worker_verify_user), (gdm_session_worker_open),
(open_idle), (queue_open), (on_begin_verification),
(on_begin_verification_for_user), (gdm_session_worker_constructor):
* daemon/gdm-session.c: (gdm_session_write_record),
(do_introspect), (gdm_session_open), (send_begin_verification),
(send_begin_verification_for_user):
* daemon/gdm-session.h:
* daemon/gdm-simple-slave.c: (on_greeter_cancel),
(on_greeter_connected):
* daemon/test-session.c: (main):
Also pass x11-display when opening the session.
Patch from Brian Cameron <brian.cameron@sun.com>
svn path=/branches/mccann-gobject/; revision=5358
Diffstat (limited to 'daemon/gdm-simple-slave.c')
| -rw-r--r-- | daemon/gdm-simple-slave.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index b6e98a08..6b8892a2 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -904,8 +904,14 @@ static void on_greeter_cancel (GdmGreeterServer *greeter_server, GdmSimpleSlave *slave) { + char *display_name; + g_debug ("Greeter cancelled"); + g_object_get (slave, + "display-name", &display_name, + NULL); + if (slave->priv->session != NULL) { gdm_session_close (slave->priv->session); g_object_unref (slave->priv->session); @@ -916,8 +922,11 @@ on_greeter_cancel (GdmGreeterServer *greeter_server, gdm_session_open (slave->priv->session, "gdm", "" /* hostname */, + display_name, "/dev/console", NULL); + + g_free (display_name); } static void @@ -925,8 +934,10 @@ on_greeter_connected (GdmGreeterServer *greeter_server, GdmSimpleSlave *slave) { gboolean display_is_local; + char *display_name; g_object_get (slave, + "display-name", &display_name, "display-is-local", &display_is_local, NULL); @@ -935,6 +946,7 @@ on_greeter_connected (GdmGreeterServer *greeter_server, gdm_session_open (slave->priv->session, "gdm", "" /* hostname */, + display_name, "/dev/console", NULL); @@ -942,6 +954,8 @@ on_greeter_connected (GdmGreeterServer *greeter_server, if ( ! display_is_local) { alarm (0); } + + g_free (display_name); } static void |