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

don't send a canceld filetransfer. Fixes #3586

Browse source
This commit is contained in:
Yann Leboulanger 2010-07-06 22:11:43 +02:00
parent 370c2ba2e6
commit dd38dcee5e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/protocol/bytestream.py
View file

@ -596,7 +596,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
raise xmpp.NodeProcessed raise xmpp.NodeProcessed
if real_id.startswith('au_'): if real_id.startswith('au_'):
if 'stopped' in file and file_props['stopped']: if 'stopped' in file_props and file_props['stopped']:
self.remove_transfer(file_props) self.remove_transfer(file_props)
else: else:
gajim.socks5queue.send_file(file_props, self.name) gajim.socks5queue.send_file(file_props, self.name)
@ -608,6 +608,9 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
if proxyhost['jid'] == jid: if proxyhost['jid'] == jid:
proxy = proxyhost proxy = proxyhost
if 'stopped' in file_props and file_props['stopped']:
self.remove_transfer(file_props)
raise xmpp.NodeProcessed
if proxy is not None: if proxy is not None:
file_props['streamhost-used'] = True file_props['streamhost-used'] = True
if 'streamhosts' not in file_props: if 'streamhosts' not in file_props:
@ -621,9 +624,6 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
gajim.socks5queue.on_success = self._proxy_auth_ok gajim.socks5queue.on_success = self._proxy_auth_ok
raise xmpp.NodeProcessed raise xmpp.NodeProcessed
else:
if 'stopped' in file_props and file_props['stopped']:
self.remove_transfer(file_props)
else: else:
gajim.socks5queue.send_file(file_props, self.name) gajim.socks5queue.send_file(file_props, self.name)
if 'fast' in file_props: if 'fast' in file_props: