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 11:10:01 +0200 |
| commit | 680a5dd2a492078a0cc497502aab1d81cdba39ac (patch) | |
| tree | fc07f382a3942f5983392a9458c4bc77f38adb1f /telepathy-glib/base-media-call-content.c | |
| parent | 8c682d0122b066ad69cc7106884f383563c2ba6d (diff) | |
| download | telepathy-glib-680a5dd2a492078a0cc497502aab1d81cdba39ac.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.
Diffstat (limited to 'telepathy-glib/base-media-call-content.c')
| -rw-r--r-- | telepathy-glib/base-media-call-content.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/telepathy-glib/base-media-call-content.c b/telepathy-glib/base-media-call-content.c index a0032f4b1..b7cf8e1d4 100644 --- a/telepathy-glib/base-media-call-content.c +++ b/telepathy-glib/base-media-call-content.c @@ -683,14 +683,6 @@ tp_base_media_call_content_update_local_media_description ( GPtrArray *codecs; gpointer contact; - if (self->priv->current_offer != NULL) - { - GError error = { TP_ERROR, 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, |