diff options
| author | Marco Barisione <marco@barisione.org> | 2011-05-25 17:00:33 +0100 |
|---|---|---|
| committer | Marco Barisione <marco@barisione.org> | 2011-05-25 17:00:52 +0100 |
| commit | 0410a2ea2db77992225a9456203ada051f3d3723 (patch) | |
| tree | 48056f2151066063a6eae079d325d99732a160cf | |
| parent | 9c27b83d9ad0f2129a235e9a1ca59c1962e3bd79 (diff) | |
| parent | 7d8c170aa270b2f3f3ee1a7b03dddf584ae847bf (diff) | |
Merge branch 'error-checking'
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | telepathy-yell/base-media-call-content.c | 3 | ||||
| -rw-r--r-- | telepathy-yell/base-media-call-stream.c | 2 | ||||
| -rw-r--r-- | telepathy-yell/call-content-codec-offer.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/telepathy-yell/base-media-call-content.c b/telepathy-yell/base-media-call-content.c index f307b94..704ab4e 100644 --- a/telepathy-yell/base-media-call-content.c +++ b/telepathy-yell/base-media-call-content.c @@ -448,7 +448,7 @@ codec_offer_finished_cb (GObject *source, local_codecs = tpy_call_content_codec_offer_offer_finish ( offer, result, &error); - if (error != NULL || priv->deinit_has_run || + if (local_codecs == NULL || priv->deinit_has_run || priv->current_offer != TPY_CALL_CONTENT_CODEC_OFFER (source)) goto out; @@ -479,6 +479,7 @@ out: --priv->offer_count; g_object_unref (source); + g_clear_error (&error); if (priv->deinit_has_run) maybe_finish_deinit (self); diff --git a/telepathy-yell/base-media-call-stream.c b/telepathy-yell/base-media-call-stream.c index fd740b5..f49fff7 100644 --- a/telepathy-yell/base-media-call-stream.c +++ b/telepathy-yell/base-media-call-stream.c @@ -437,7 +437,7 @@ tpy_base_media_call_stream_add_candidates ( g_set_error_literal (&error, TP_ERRORS, TP_ERROR_CONFUSED, "CM failed to implement the compulsory function add_local_candidates"); - if (error != NULL) + if (accepted_candidates == NULL) goto except; for (i = 0; i < accepted_candidates->len; i++) diff --git a/telepathy-yell/call-content-codec-offer.c b/telepathy-yell/call-content-codec-offer.c index 040791a..425aa10 100644 --- a/telepathy-yell/call-content-codec-offer.c +++ b/telepathy-yell/call-content-codec-offer.c @@ -413,7 +413,7 @@ tpy_call_content_codec_offer_offer_finish ( { if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error)) - return FALSE; + return NULL; g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (offer), tpy_call_content_codec_offer_offer_finish), |