changeset e7832358c2e3 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=e7832358c2e3
description: make werequest an optional argument in JingleSession
diffstat:
src/common/jingle.py | 4 ++--
src/common/jingle_session.py | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diffs (34 lines):
diff -r b8909ee93957 -r e7832358c2e3 src/common/jingle.py
--- a/src/common/jingle.py Sat Jun 09 15:17:16 2012 -0400
+++ b/src/common/jingle.py Sun Jun 10 17:08:54 2012 -0400
@@ -101,7 +101,7 @@
# 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 @@
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
diff -r b8909ee93957 -r e7832358c2e3 src/common/jingle_session.py
--- a/src/common/jingle_session.py Sat Jun 09 15:17:16 2012 -0400
+++ b/src/common/jingle_session.py Sun Jun 10 17:08:54 2012 -0400
@@ -63,7 +63,8 @@
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?
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
