changeset d03e3741418f in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=d03e3741418f description: send file using IBB directly if receiver don't support socks5

diffstat:

src/common/jingle.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 7abc69040440 -r d03e3741418f src/common/jingle.py --- a/src/common/jingle.py Sun Jan 08 20:48:03 2012 +0100 +++ b/src/common/jingle.py Sun Jan 08 20:57:05 2012 +0100 @@ -38,6 +38,7 @@ if gajim.HAVE_FARSIGHT: from jingle_rtp import JingleAudio, JingleVideo from jingle_ft import JingleFileTransfer +from jingle_transport import JingleTransportSocks5, JingleTransportIBB

import logging logger = logging.getLogger('gajim.c.jingle') @@ -150,8 +151,12 @@ jingle = JingleSession(self, weinitiate=True, jid=jid) self._sessions[jingle.sid] = jingle file_props['sid'] = jingle.sid - c = JingleFileTransfer(jingle, file_props=file_props, - use_security=use_security) + if contact.supports(xmpp.NS_JINGLE_BYTESTREAM): + transport = JingleTransportSocks5() + elif contact.supports(xmpp.NS_JINGLE_IBB): + transport = JingleTransportIBB() + c = JingleFileTransfer(jingle, transport=transport, + file_props=file_props, use_security=use_security) jingle.add_content('file' + helpers.get_random_string_16(), c) jingle.start_session() return c.transport.sid