copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make werequest an optional argument in JingleSession

This commit is contained in:
Jefry Lagrange 2012-06-10 17:08:54 -04:00
parent 3a5d6d2173
commit b6b44cb328
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/jingle.py
View File

@ -101,7 +101,7 @@ class ConnectionJingle(object):
# do we need to create a new jingle object
if sid not in self._sessions:
#TODO: tie-breaking and other things...
newjingle = JingleSession(con=self, werequest=False, weinitiate=False, jid=jid,
newjingle = JingleSession(con=self, weinitiate=False, jid=jid,
iq_id=id_, sid=sid)
self._sessions[sid] = newjingle
@ -148,7 +148,7 @@ class ConnectionJingle(object):
if contact is None:
return
use_security = contact.supports(xmpp.NS_JINGLE_XTLS)
jingle = JingleSession(self, request, weinitiate=True, jid=jid)
jingle = JingleSession(self, weinitiate=True, jid=jid, werequest=request)
# this is a file transfer
jingle.session_type_FT = True
self._sessions[jingle.sid] = jingle

3
src/common/jingle_session.py
View File

@ -63,7 +63,8 @@ class JingleSession(object):
negotiated between an initiator and a responder.
"""
def __init__(self, con, werequest, weinitiate, jid, iq_id=None, sid=None):
def __init__(self, con, weinitiate, jid, iq_id=None, sid=None,
werequest=False):
"""
con -- connection object,
weinitiate -- boolean, are we the initiator?