summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2012-02-24 15:48:23 -0500
committerOlivier CrĂȘte <olivier.crete@collabora.com>2012-02-24 15:48:23 -0500
commitccf9654e5b987a552660769d1649a93d5401acb6 (patch)
tree2564d27ab77529733cef0e5cac7a288186289e2f
parent8517957e4d266351eb1dd0e0b2e8834e6a163248 (diff)
Only reject codecs on the proper error
-rw-r--r--rakia/call-content.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/rakia/call-content.c b/rakia/call-content.c
index 6031601..d54d587 100644
--- a/rakia/call-content.c
+++ b/rakia/call-content.c
@@ -299,11 +299,17 @@ md_offer_cb (GObject *obj, GAsyncResult *res, gpointer user_data)
}
else
{
- g_assert (!is_initial_offer);
+ /* Only reject if the codecs where rejected */
+ if (error->domain == TP_ERRORS &&
+ error->code == TP_ERROR_MEDIA_CODECS_INCOMPATIBLE)
+ {
+ g_assert (!is_initial_offer);
- rakia_sip_media_codecs_rejected (priv->media);
+ rakia_sip_media_codecs_rejected (priv->media);
- DEBUG ("Codecs rejected: %s", error->message);
+ DEBUG ("Codecs rejected: %s", error->message);
+
+ }
/* FIXME: We need to allow for partial failures */
g_clear_error (&error);