changeset 8be22cc843f9 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8be22cc843f9 description: [noonien] Fix using receiver candidate when sending a file via jingle. Fixes #7987

diffstat:

src/common/socks5.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 6c40c9c4d0ae -r 8be22cc843f9 src/common/socks5.py --- a/src/common/socks5.py Sun Mar 29 14:38:10 2015 +0200 +++ b/src/common/socks5.py Sun Apr 05 21:26:16 2015 +0200 @@ -149,7 +149,9 @@ socks5obj = Socks5SenderClient(self.idlequeue, idx, self, _sock=None,host=str(streamhost['host']), port=int(streamhost['port']),fingerprint=fp, - connected=False, file_props=file_props) + connected=False, file_props=file_props, + initiator=streamhost['initiator'], + target=streamhost['target']) socks5obj.streamhost = streamhost self.add_sockobj(account, socks5obj)

@@ -1331,8 +1333,9 @@ class Socks5SenderClient(Socks5Client, Socks5Sender):

def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, - port=None, fingerprint = None, connected=True, file_props=None): - Socks5Client.__init__(self, idlequeue, host, port, None, None, + port=None, fingerprint = None, connected=True, file_props=None, + initiator=None, target=None): + Socks5Client.__init__(self, idlequeue, host, port, initiator, target, file_props.sid) Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, host, port, fingerprint , connected, file_props)