diff options
| author | William Jon McCann <mccann@src.gnome.org> | 2007-06-21 20:04:37 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2007-06-21 20:04:37 +0000 |
| commit | 85edd92d6de2f2b2e03fcd1097ef199df11c5aa8 (patch) | |
| tree | d2c522664a1c3922a5a55dd25b911022d5b8bf7d /daemon/gdm-product-slave.c | |
| parent | 4f1952f28fae19083b80e676c930e0ef3469e179 (diff) | |
| download | gdm-85edd92d6de2f2b2e03fcd1097ef199df11c5aa8.tar.gz | |
Make cancellation work. Fix up the signal handler and add backtraces.
svn path=/branches/mccann-gobject/; revision=5012
Diffstat (limited to 'daemon/gdm-product-slave.c')
| -rw-r--r-- | daemon/gdm-product-slave.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/daemon/gdm-product-slave.c b/daemon/gdm-product-slave.c index da3b70c8..623a5dc4 100644 --- a/daemon/gdm-product-slave.c +++ b/daemon/gdm-product-slave.c @@ -903,12 +903,12 @@ create_new_session (GdmProductSlave *slave) } static void -on_relay_reset (DBusGProxy *proxy, - gpointer data) +on_relay_cancelled (DBusGProxy *proxy, + gpointer data) { GdmProductSlave *slave = GDM_PRODUCT_SLAVE (data); - g_debug ("Relay reset"); + g_debug ("Relay cancelled"); if (slave->priv->session != NULL) { gdm_session_close (slave->priv->session); @@ -1128,7 +1128,7 @@ static void session_relay_proxy_destroyed (GObject *object, gpointer data) { - g_debug ("Session server proxy destroyed"); + g_debug ("Session server relay destroyed"); } static void @@ -1209,7 +1209,7 @@ connect_to_session_relay (GdmProductSlave *slave) "Open", G_TYPE_INVALID); dbus_g_proxy_add_signal (slave->priv->session_relay_proxy, - "Reset", + "Cancelled", G_TYPE_INVALID); dbus_g_proxy_connect_signal (slave->priv->session_relay_proxy, @@ -1238,8 +1238,8 @@ connect_to_session_relay (GdmProductSlave *slave) slave, NULL); dbus_g_proxy_connect_signal (slave->priv->session_relay_proxy, - "Reset", - G_CALLBACK (on_relay_reset), + "Cancelled", + G_CALLBACK (on_relay_cancelled), slave, NULL); |