[telepathy-gabble/master] Incoming GTalk4 calls do need transport-accept

[Will Thompson]

---
 src/jingle-content.c                    |   10 +++++-----
 tests/twisted/jingle/incoming-basics.py |    7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/jingle-content.c b/src/jingle-content.c
index da0cf0c..6745334 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -566,12 +566,12 @@ gabble_jingle_content_parse_add (GabbleJingleContent *c,
 
   priv->state = JINGLE_CONTENT_STATE_NEW;
 
-  /* GTALK4 seems to require "transport-accept" for acknowledging
-   * the transport type? */
+  /* GTalk4 seems to require "transport-accept" for acknowledging
+   * the transport type. wjt confirms that this is apparently necessary for
+   * incoming calls to work.
+   */
   if (dialect == JINGLE_DIALECT_GTALK4)
-    {
-      priv->gtalk4_event_id = g_idle_add (send_gtalk4_transport_accept, c);
-    }
+    priv->gtalk4_event_id = g_idle_add (send_gtalk4_transport_accept, c);
 
   return;
 }
diff --git a/tests/twisted/jingle/incoming-basics.py b/tests/twisted/jingle/incoming-basics.py
index 7043d75..054b653 100644
--- a/tests/twisted/jingle/incoming-basics.py
+++ b/tests/twisted/jingle/incoming-basics.py
@@ -32,10 +32,9 @@ def test(jp, q, bus, conn, stream):
 
     if jp.dialect == 'gtalk-v0.4':
         # With gtalk4, apparently we have to send transport-accept immediately,
-        # not even just before we send our transport-info.
-        # FIXME: wjt thinks this is suspicious. It matches the Gabble
-        #        implementation, so he moved it here to avoid the test being
-        #        racy, but we should do some more interop testing.
+        # not even just before we send our transport-info. wjt tested this, and
+        # indeed if we don't send this for incoming calls, the call never
+        # connects.
         ta_event = [
             EventPattern('stream-iq', predicate=lambda x:
                 xpath.queryForNodes("/iq/session[@type='transport-accept']",
-- 
1.5.6.5