From 0ced9a43b562b567d97a98d18da2bceaff3e68e3 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 28 Apr 2009 09:59:07 +0100 Subject: tube-handler: use tp_channel_call_when_ready instead of tp_channel_run_until_ready --- libempathy/empathy-tube-handler.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-tube-handler.c b/libempathy/empathy-tube-handler.c index cbd004d14..d4c4d63be 100644 --- a/libempathy/empathy-tube-handler.c +++ b/libempathy/empathy-tube-handler.c @@ -85,6 +85,28 @@ tube_ready_destroy_notify (gpointer data) g_slice_free (IdleData, idle_data); } +static void +channel_ready_cb (TpChannel *channel, + const GError *error, + gpointer data) +{ + IdleData *idle_data = data; + + if (error != NULL) + { + DEBUG ("channel has been invalidated: %s", error->message); + tube_ready_destroy_notify (data); + g_object_unref (channel); + return; + } + + idle_data->tube = empathy_tp_tube_new (channel); + empathy_tp_tube_call_when_ready (idle_data->tube, tube_ready_cb, idle_data, + tube_ready_destroy_notify, NULL); + + g_object_unref (channel); +} + static void connection_ready_cb (TpConnection *connection, const GError *error, @@ -104,13 +126,8 @@ connection_ready_cb (TpConnection *connection, channel = tp_channel_new (connection, idle_data->channel, TP_IFACE_CHANNEL_TYPE_TUBES, idle_data->handle_type, idle_data->handle, NULL); - tp_channel_run_until_ready (channel, NULL, NULL); + tp_channel_call_when_ready (channel, channel_ready_cb, idle_data); - idle_data->tube = empathy_tp_tube_new (channel); - empathy_tp_tube_call_when_ready (idle_data->tube, tube_ready_cb, idle_data, - tube_ready_destroy_notify, NULL); - - g_object_unref (channel); g_object_unref (connection); } -- cgit v1.2.3