Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Leboulanger <asterix@lagaule.org>2012-06-14 21:46:17 +0400
committerYann Leboulanger <asterix@lagaule.org>2012-06-14 21:46:17 +0400
commit0493997a2409a8232cf260e2b5c78423010b1294 (patch)
tree7d8e5bb12cffb8c06a3691d319cb66bbc9ce5e59
parent503c7dc515f5985e8f092878e9d3b3808faef090 (diff)
handle ft_send_local_ips option with jingle FT
-rw-r--r--src/common/jingle_transport.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/common/jingle_transport.py b/src/common/jingle_transport.py
index 543150d11..fdf74e0d9 100644
--- a/src/common/jingle_transport.py
+++ b/src/common/jingle_transport.py
@@ -78,7 +78,7 @@ class JingleTransport(object):
Return the list of transport candidates from a transport stanza
"""
return []
-
+
def set_connection(self, conn):
self.connection = conn
if not self.sid:
@@ -89,7 +89,7 @@ class JingleTransport(object):
def set_our_jid(self, jid):
self.ourjid = jid
-
+
def set_sid(self, sid):
self.sid = sid
@@ -168,6 +168,9 @@ class JingleTransportSocks5(JingleTransport):
self.candidates.append(cand)
def _add_local_ips_as_candidates(self):
+ if not gajim.config.get_per('accounts', self.connection.name,
+ 'ft_send_local_ips'):
+ return
if not self.connection:
return
local_ip_cand = []
@@ -259,7 +262,7 @@ class JingleTransportSocks5(JingleTransport):
self.file_props.session_sid)
if sesn is None:
return
-
+
iq = xmpp.Iq(to=proxy['jid'], frm=self.ourjid, typ='set')
auth_id = "au_" + proxy['sid']
iq.setID(auth_id)
@@ -321,7 +324,7 @@ class JingleTransportIBB(JingleTransport):
transport.setAttr('block-size', self.block_sz)
transport.setAttr('sid', self.sid)
return transport
-
+
try:
import farstream
except Exception: