changeset 6b496ce3bb49 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6b496ce3bb49 description: fix sending candidates and computing hash in jingle file transfer. Fixes #7669

diffstat:

src/common/jingle_ft.py | 2 +- src/common/jingle_transport.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 9c3e121af11f -r 6b496ce3bb49 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Apr 23 21:53:40 2014 +0200 +++ b/src/common/jingle_ft.py Fri Apr 25 12:48:39 2014 +0200 @@ -110,7 +110,7 @@ STATE_TRANSPORT_REPLACE : StateTransportReplace(self), STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) } - + if jingle_xtls.PYOPENSSL_PRESENT: cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'], jingle_xtls.SELF_SIGNED_CERTIFICATE) diff -r 9c3e121af11f -r 6b496ce3bb49 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Wed Apr 23 21:53:40 2014 +0200 +++ b/src/common/jingle_transport.py Fri Apr 25 12:48:39 2014 +0200 @@ -69,7 +69,7 @@ candidates is None) """ if not candidates: - candidates = self._iter_candidates() + candidates = list(self._iter_candidates()) else: candidates = (self.make_candidate(candidate) for candidate in candidates) transport = nbxmpp.Node('transport', payload=candidates)