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

fix computing hash once socket is correctly closed

Browse source
This commit is contained in:
Yann Leboulanger 2013-11-02 16:09:12 +01:00
parent 4da8a480d0
commit f888f57d1c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/socks5.py
View file

@ -379,6 +379,7 @@ class SocksQueue:
self.idlequeue.remove_timeout(reader.fd) self.idlequeue.remove_timeout(reader.fd)
if do_disconnect: if do_disconnect:
reader.disconnect() reader.disconnect()
del self.readers[key]
if not remove_all: if not remove_all:
break break
else: else:

2
src/gui_interface.py
View file

@ -996,13 +996,13 @@ class Interface:
return return
if file_props.type_ == 'r' and file_props.hash_: # we receive a file if file_props.type_ == 'r' and file_props.hash_: # we receive a file
gajim.socks5queue.remove_receiver(file_props.sid, True, True)
# we compare hashes # we compare hashes
if file_props.session_type == 'jingle': if file_props.session_type == 'jingle':
# Compare hashes in a new thread # Compare hashes in a new thread
self.hashThread = Thread(target=self.__compare_hashes, self.hashThread = Thread(target=self.__compare_hashes,
args=(account, file_props)) args=(account, file_props))
self.hashThread.start() self.hashThread.start()
gajim.socks5queue.remove_receiver(file_props.sid, True, True)
else: # we send a file else: # we send a file
jid = file_props.receiver jid = file_props.receiver
gajim.socks5queue.remove_sender(file_props.sid, True, True) gajim.socks5queue.remove_sender(file_props.sid, True, True)