changeset 2f419e456092 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=2f419e456092
description: Fixed a typo ; Prepared tie breaking and content-info handling
diffstat:
src/common/jingle.py | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diffs (65 lines):
diff -r ea637f2d4192 -r 2f419e456092 src/common/jingle.py
--- a/src/common/jingle.py Sun Sep 27 22:56:09 2009 +0200
+++ b/src/common/jingle.py Mon Sep 28 22:23:48 2009 +0200
@@ -115,7 +115,7 @@
'content-modify': [self.__defaultCB], #TODO
'content-reject': [self.__defaultCB,
self.__contentRemoveCB], #TODO
'content-remove': [self.__defaultCB,
self.__contentRemoveCB],
- 'description-info': [self.__defaultCB], #TODO
+ 'description-info': [self.__broadcastCB,
self.__defaultCB], #TODO
'security-info': [self.__defaultCB], #TODO
'session-accept': [self.__sessionAcceptCB,
self.__contentAcceptCB,
self.__broadcastCB, self.__defaultCB],
@@ -680,12 +680,18 @@
'content-accept': [self.__transportInfoCB],
'content-add': [self.__transportInfoCB],
'content-modify': [],
+ 'content-reject': [],
'content-remove': [],
+ 'description-info': [],
+ 'security-info': [],
'session-accept': [self.__transportInfoCB],
'session-info': [],
'session-initiate': [self.__transportInfoCB],
'session-terminate': [],
'transport-info': [self.__transportInfoCB],
+ 'transport-replace': [],
+ 'transport-accept': [],
+ 'transport-reject': [],
'iq-result': [],
'iq-error': [],
# these are called when *we* sent these stanzas
@@ -738,6 +744,8 @@
'multicast':
farsight.CANDIDATE_TYPE_MULTICAST}
if 'type' in candidate and candidate['type'] in types:
cand.type = types[candidate['type']]
+ else:
+ print 'Unknown type %s', candidate['type']
candidates.append(cand)
#FIXME: connectivity should not be etablished yet
# Instead, it should be etablished after session-accept!
@@ -753,7 +761,7 @@
def __candidate(self, candidate):
types = {farsight.CANDIDATE_TYPE_HOST: 'host',
- farsight.CANDIDATE_TYPE_SRFLX: 'srlfx',
+ farsight.CANDIDATE_TYPE_SRFLX: 'srflx',
farsight.CANDIDATE_TYPE_PRFLX: 'prlfx',
farsight.CANDIDATE_TYPE_RELAY: 'relay',
farsight.CANDIDATE_TYPE_MULTICAST: 'multicast'}
@@ -882,6 +890,7 @@
elif name == 'farsight-codecs-changed':
if self.is_ready():
self.session.on_session_state_changed(self)
+ #TODO: description-info
elif name == 'farsight-local-candidates-prepared':
self.candidates_ready = True
if self.is_ready():
@@ -1087,6 +1096,7 @@
# do we need to create a new jingle object
if (jid, sid) not in self.__sessions:
+ #TODO: tie-breaking and other things...
newjingle = JingleSession(con=self, weinitiate=False,
jid=jid, sid=sid)
self.add_jingle(newjingle)
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
