summaryrefslogtreecommitdiff
path: root/daemon/gdm-factory-slave.c
diff options
context:
space:
mode:
authorWilliam Jon McCann <mccann@src.gnome.org>2007-06-21 20:04:37 +0000
committerWilliam Jon McCann <mccann@src.gnome.org>2007-06-21 20:04:37 +0000
commit85edd92d6de2f2b2e03fcd1097ef199df11c5aa8 (patch)
treed2c522664a1c3922a5a55dd25b911022d5b8bf7d /daemon/gdm-factory-slave.c
parent4f1952f28fae19083b80e676c930e0ef3469e179 (diff)
downloadgdm-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-factory-slave.c')
-rw-r--r--daemon/gdm-factory-slave.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c
index e643fdc6..0f613d98 100644
--- a/daemon/gdm-factory-slave.c
+++ b/daemon/gdm-factory-slave.c
@@ -522,10 +522,10 @@ on_greeter_user_selected (GdmGreeterServer *greeter_server,
}
static void
-on_greeter_reset (GdmGreeterServer *greeter_server,
- GdmFactorySlave *slave)
+on_greeter_cancel (GdmGreeterServer *greeter_server,
+ GdmFactorySlave *slave)
{
- gdm_session_relay_reset (slave->priv->session_relay);
+ gdm_session_relay_cancel (slave->priv->session_relay);
}
static void
@@ -602,8 +602,8 @@ run_greeter (GdmFactorySlave *slave)
G_CALLBACK (on_greeter_connected),
slave);
g_signal_connect (slave->priv->greeter_server,
- "reset",
- G_CALLBACK (on_greeter_reset),
+ "cancelled",
+ G_CALLBACK (on_greeter_cancel),
slave);
gdm_greeter_server_start (slave->priv->greeter_server);