From ee05914b30512dbadaceada6edb36c382fdced71 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Wed, 20 Jun 2012 23:16:18 +0200
Subject: [PATCH] fix typo remove "fast" support try to connect to streamhosts
when we get them
---
src/common/protocol/bytestream.py | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/common/protocol/bytestream.py b/src/common/protocol/bytestream.py
index 1c7c32c8c1..9302884437 100644
--- a/src/common/protocol/bytestream.py
+++ b/src/common/protocol/bytestream.py
@@ -639,7 +639,6 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
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 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
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 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
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 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
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
--
GitLab