Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim

Commits: 2ce5012b by Yann Leboulanger at 2017-08-10T22:05:31+02:00 don't show audio error when it's not an audio error. Fixes #8614

- - - - - 7c84d52c by Yann Leboulanger at 2017-08-10T22:05:31+02:00 don't close the socket we're using to tranfer file. Fixes #8657

- - - - -

2 changed files:

- src/common/socks5.py - src/gui_interface.py

Changes:

===================================== src/common/socks5.py ===================================== --- a/src/common/socks5.py +++ b/src/common/socks5.py @@ -597,7 +597,8 @@ class Socks5(object): pass self.file = None # Close file we're receiving into - if self.file_props.fd: + if self.file_props.fd and self.state >= 7: + # file opened and it's the Sock we're using to transfer try: self.file_props.fd.close() except Exception:

===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -1330,7 +1330,7 @@ class Interface: account = obj.conn.name ctrl = (self.msg_win_mgr.get_control(obj.fjid, account) or self.msg_win_mgr.get_control(obj.jid, account)) - if ctrl: + if ctrl and obj.sid == ctrl.audio_sid: ctrl.set_audio_state('error', reason=obj.reason)

def handle_event_roster_item_exchange(self, obj):

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c19bad88b557cc4ad1e8ef1dfa656252fd...

--- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c19bad88b557cc4ad1e8ef1dfa656252fd... You're receiving this email because of your account on dev.gajim.org.