diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2012-09-03 11:10:01 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2012-09-03 14:08:53 +0200 |
| commit | f55630f7da156b0773e999ac70916d340f7b23e0 (patch) | |
| tree | 625d3085a451992d31e448ab4fbb3eaa3406ac03 | |
| parent | 1090f37723ace6343cc6d24871390005ce435e1f (diff) | |
| download | telepathy-glib-f55630f7da156b0773e999ac70916d340f7b23e0.tar.gz | |
Fix incorrect error on UpdateLocalMediaDescription
Remove the code that errors out a local description update if there is
*any* outstanding offer. A bit later in the same function a proper check
is done to see if there is a offer for the update contact, which is
correct.
Conflicts:
telepathy-glib/base-media-call-content.c
| -rw-r--r-- | telepathy-glib/base-media-call-content.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/telepathy-glib/base-media-call-content.c b/telepathy-glib/base-media-call-content.c index 47fc6d2f8..cf5552305 100644 --- a/telepathy-glib/base-media-call-content.c +++ b/telepathy-glib/base-media-call-content.c @@ -683,15 +683,6 @@ tp_base_media_call_content_update_local_media_description ( GPtrArray *codecs; gpointer contact; - if (self->priv->current_offer != NULL) - { - GError error = { TP_ERRORS, TP_ERROR_NOT_AVAILABLE, - "There is a media description offer around so " - "UpdateMediaDescription shouldn't be called." }; - dbus_g_method_return_error (context, &error); - return; - } - if (!g_hash_table_lookup_extended (properties, TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT, NULL, &contact)) |