changeset 574293a69d0e in /home/hg/repos/gajim
author: Yann Leboulanger asterix@lagaule.org branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=574293a69d0e description: fix computing hash once socket is correctly closed
diffstat:
src/common/socks5.py | 1 + src/gui_interface.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
diffs (29 lines):
diff -r b86d4bdf5e81 -r 574293a69d0e src/common/socks5.py --- a/src/common/socks5.py Sat Nov 02 09:00:16 2013 +0100 +++ b/src/common/socks5.py Sat Nov 02 16:09:12 2013 +0100 @@ -379,6 +379,7 @@ self.idlequeue.remove_timeout(reader.fd) if do_disconnect: reader.disconnect() + del self.readers[key] if not remove_all: break else: diff -r b86d4bdf5e81 -r 574293a69d0e src/gui_interface.py --- a/src/gui_interface.py Sat Nov 02 09:00:16 2013 +0100 +++ b/src/gui_interface.py Sat Nov 02 16:09:12 2013 +0100 @@ -996,13 +996,13 @@ return
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 if file_props.session_type == 'jingle': # Compare hashes in a new thread self.hashThread = Thread(target=self.__compare_hashes, args=(account, file_props)) self.hashThread.start() - gajim.socks5queue.remove_receiver(file_props.sid, True, True) else: # we send a file jid = file_props.receiver gajim.socks5queue.remove_sender(file_props.sid, True, True)