[telepathy-gabble/master] Ignore description-info before receiving codec data

[Sjoerd Simons]

---
 src/jingle-content.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/jingle-content.c b/src/jingle-content.c
index 19aec46..5db1607 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -657,6 +657,7 @@ void
 gabble_jingle_content_parse_description_info (GabbleJingleContent *c,
     LmMessageNode *content_node, GError **error)
 {
+  GabbleJingleContentPrivate *priv = c->priv;
   LmMessageNode *desc_node;
   desc_node = lm_message_node_get_child_any_ns (content_node, "description");
   if (desc_node == NULL)
@@ -665,6 +666,15 @@ gabble_jingle_content_parse_description_info (GabbleJingleContent *c,
       return;
     }
 
+  if (priv->created_by_us && priv->state < JINGLE_CONTENT_STATE_ACKNOWLEDGED)
+    {
+      /* The stream was created us and the other side didn't acknowledge it
+       * yet, thus we don't have their code information, thus the
+       * description-info isn't meaningful and can be ignored */
+      DEBUG ("Ignoring description-info as we didn't receive the codecs yet");
+      return;
+    }
+
   parse_description (c, desc_node, error);
 }
 
-- 
1.5.6.5