diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-12-18 14:28:02 +0000 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-12-18 18:41:00 +0000 |
| commit | 6c3fee622752404275333df672d0d0970b819cf2 (patch) | |
| tree | 4f86a5affb0747fae4823026428270040966524e /src/bytestream-factory.c | |
| parent | 67e61a2f508c9ed75fe7b892c52f7fae53f49cf6 (diff) | |
| download | telepathy-gabble-6c3fee622752404275333df672d0d0970b819cf2.tar.gz | |
Make sure we only call the callback if it's still alive
Diffstat (limited to 'src/bytestream-factory.c')
| -rw-r--r-- | src/bytestream-factory.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c index 908c6f986..acdad38d7 100644 --- a/src/bytestream-factory.c +++ b/src/bytestream-factory.c @@ -2121,19 +2121,18 @@ streaminit_reply_cb (GabbleConnection *conn, END: if (!success && bytestream != NULL) { - /* Initiation failed. We remove the stream */ remove_bytestream (self, bytestream); bytestream = NULL; } /* user callback */ - data->func (bytestream, (const gchar*) data->stream_id, reply_msg, - data->object, data->user_data); + if (data->object_alive) + data->func (bytestream, (const gchar*) data->stream_id, reply_msg, + data->object, data->user_data); if (peer_resource != NULL) g_free (peer_resource); - if (peer_handle != 0) tp_handle_unref (contact_repo, peer_handle); |