From 400390acaa95cb0d127d7cac8b47a2623a97a245 Mon Sep 17 00:00:00 2001 From: Thibaut GIRKA Date: Mon, 4 Jan 2010 18:27:18 +0100 Subject: [PATCH] Correct JingleContent.send_candidate and JingleTransport.make_transport. Fixes #5525 --- src/common/jingle_content.py | 2 +- src/common/jingle_transport.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/jingle_content.py b/src/common/jingle_content.py index a3a8d9d80..7331d82c7 100644 --- a/src/common/jingle_content.py +++ b/src/common/jingle_content.py @@ -118,7 +118,7 @@ class JingleContent(object): Send a transport candidate for a previously defined transport. """ content = self.__content() - content.addChild(self.transport.make_transport([candidate])) + content.addChild(node=self.transport.make_transport([candidate])) self.session.send_transport_info(content) def __fill_jingle_stanza(self, stanza, content, error, action): diff --git a/src/common/jingle_transport.py b/src/common/jingle_transport.py index acf97ea11..82a0cb987 100644 --- a/src/common/jingle_transport.py +++ b/src/common/jingle_transport.py @@ -60,6 +60,8 @@ class JingleTransport(object): """ if not candidates: candidates = self._iter_candidates() + else: + candidates = (self.make_candidate(candidate) for candidate in candidates) transport = xmpp.Node('transport', payload=candidates) return transport @@ -145,4 +147,4 @@ class JingleTransportICEUDP(JingleTransport): transports[xmpp.NS_JINGLE_ICE_UDP] = JingleTransportICEUDP -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: