Merge commit 'sjoerd/master'

svn path=/trunk/; revision=637

1 files changed, 23 insertions, 1 deletions

diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index b72e3877e..4ec4a97ff 100644
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -326,6 +326,20 @@ tp_call_request_streams_for_capabilities (EmpathyTpCall *call,
 }
 
 static void
+tp_call_request_streams_capabilities_cb (EmpathyContact *contact,
+  GParamSpec *property, gpointer user_data)
+{
+  EmpathyTpCall *call = EMPATHY_TP_CALL (user_data);
+
+  g_signal_handlers_disconnect_by_func (contact,
+        tp_call_request_streams_capabilities_cb,
+        user_data);
+
+  tp_call_request_streams_for_capabilities (call,
+     empathy_contact_get_capabilities (contact));
+}
+
+static void
 tp_call_request_streams (EmpathyTpCall *call)
 {
   EmpathyTpCallPriv *priv = GET_PRIV (call);
@@ -335,7 +349,6 @@ tp_call_request_streams (EmpathyTpCall *call)
   empathy_debug (DEBUG_DOMAIN,
       "Requesting appropriate audio/video streams from contact");
 
-  capabilities = empathy_contact_get_capabilities (priv->contact);
 
   /* FIXME: SIP don't have capabilities interface but we know it supports
    *        only audio and not video. */
@@ -345,6 +358,15 @@ tp_call_request_streams (EmpathyTpCall *call)
     {
       capabilities = EMPATHY_CAPABILITIES_AUDIO;
     }
+  else
+    {
+      capabilities = empathy_contact_get_capabilities (priv->contact);
+      if (capabilities == EMPATHY_CAPABILITIES_UNKNOWN) {
+        g_signal_connect (G_OBJECT (priv->contact), "notify::capabilities",
+          G_CALLBACK (tp_call_request_streams_capabilities_cb), call);
+        return;
+      }
+    }
 
   tp_call_request_streams_for_capabilities (call, capabilities);
 }