copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[noonien] Fix using receiver candidate when sending a file via jingle. Fixes #7987

This commit is contained in:
Yann Leboulanger 2015-04-05 21:26:16 +02:00
parent ba55600c43
commit c4e1f2389a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/socks5.py
View File

@ -149,7 +149,9 @@ class SocksQueue:
socks5obj = Socks5SenderClient(self.idlequeue, idx, socks5obj = Socks5SenderClient(self.idlequeue, idx,
self, _sock=None,host=str(streamhost['host']), self, _sock=None,host=str(streamhost['host']),
port=int(streamhost['port']),fingerprint=fp, 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 socks5obj.streamhost = streamhost
self.add_sockobj(account, socks5obj) self.add_sockobj(account, socks5obj)
@ -1331,8 +1333,9 @@ class Socks5Client(Socks5):
class Socks5SenderClient(Socks5Client, Socks5Sender): class Socks5SenderClient(Socks5Client, Socks5Sender):
def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, def __init__(self, idlequeue, sock_hash, parent,_sock, host=None,
port=None, fingerprint = None, connected=True, file_props=None): port=None, fingerprint = None, connected=True, file_props=None,
Socks5Client.__init__(self, idlequeue, host, port, None, None, initiator=None, target=None):
Socks5Client.__init__(self, idlequeue, host, port, initiator, target,
file_props.sid) file_props.sid)
Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock,
host, port, fingerprint , connected, file_props) host, port, fingerprint , connected, file_props)