[telepathy-glib-0.18] telepathy-glib: Fix incorrect error on UpdateLocalMediaDescription

[Sjoerd Simons]

Module: telepathy-glib
Branch: telepathy-glib-0.18
Commit: f55630f7da156b0773e999ac70916d340f7b23e0
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=f55630f7da156b0773e999ac70916d340f7b23e0

Author: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
Date:   Mon Sep  3 11:10:01 2012 +0200

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

---

 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 47fc6d2..cf55523 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))