summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Barisione <marco@barisione.org>2011-05-25 15:42:42 (GMT)
committerMarco Barisione <marco@barisione.org>2011-05-25 16:00:05 (GMT)
commit7d8c170aa270b2f3f3ee1a7b03dddf584ae847bf (patch)
tree48056f2151066063a6eae079d325d99732a160cf
parent8fefa8c51304d898ee4c8ce7a00a2065c851d384 (diff)
downloadtelepathy-yell-7d8c170aa270b2f3f3ee1a7b03dddf584ae847bf.tar.gz
telepathy-yell-7d8c170aa270b2f3f3ee1a7b03dddf584ae847bf.tar.xz
Check the return value of functions instead of the GError when possible
-rw-r--r--telepathy-yell/base-media-call-content.c2
-rw-r--r--telepathy-yell/base-media-call-stream.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/telepathy-yell/base-media-call-content.c b/telepathy-yell/base-media-call-content.c
index 8ebe2ce..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;
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++)