changeset 01b7185e8e8a in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=01b7185e8e8a description: fix typo remove "fast" support try to connect to streamhosts when we get them
diffstat:
src/common/protocol/bytestream.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)
diffs (41 lines):
diff -r 9d43ef511f51 -r 01b7185e8e8a src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jun 14 19:46:17 2012 +0200 +++ b/src/common/protocol/bytestream.py Wed Jun 20 23:16:18 2012 +0200 @@ -639,7 +639,6 @@ streamhosts.append(host_dict) file_props = FilesProp.getFilePropBySid(sid) if file_props is not None: - file_props.fast = streamhosts if file_props.type_ == 's': # FIXME: remove fast xmlns # only psi do this if file_props.streamhosts: @@ -648,7 +647,7 @@ file_props.streamhosts = streamhosts gajim.socks5queue.connect_to_hosts(self.name, sid, self.send_success_connect_reply, None) - raise xmpp.NodeProcessed + raise xmpp.NodeProcessed else: log.warn('Gajim got streamhosts for unknown transfer. Ignoring it.') raise xmpp.NodeProcessed @@ -685,7 +684,7 @@ except Exception: # this bytestream result is not what we need pass id_ = real_id[3:] - file_props = FilesProp.getFileProp(con.name, id_) + file_props = FilesProp.getFileProp(self.name, id_) if file_props is None: raise xmpp.NodeProcessed if streamhost is None: @@ -737,11 +736,6 @@ self.remove_transfer(file_props) else: gajim.socks5queue.send_file(file_props, self.name, 'client') - if file_props.fast: - fasts = file_props.fast - if len(fasts) > 0: - self._connect_error(frm, fasts[0]['id'], file_props.sid, - code=406)
raise xmpp.NodeProcessed