changeset c105a89bedc7 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=c105a89bedc7
description: [Jingle] Move on_negotiated callback to JingleContent
diffstat:
src/common/jingle_content.py | 15 +++++++++++----
src/common/jingle_rtp.py | 12 ++++--------
2 files changed, 15 insertions(+), 12 deletions(-)
diffs (81 lines):
diff -r be31d22c35fd -r c105a89bedc7 src/common/jingle_content.py
--- a/src/common/jingle_content.py Thu Aug 26 13:52:00 2010 +0200
+++ b/src/common/jingle_content.py Thu Aug 26 16:59:29 2010 +0200
@@ -55,14 +55,16 @@
self.callbacks = {
# these are called when *we* get stanzas
- 'content-accept': [self.__on_transport_info],
+ 'content-accept': [self.__on_transport_info,
+ self.__on_content_accept],
'content-add': [self.__on_transport_info],
'content-modify': [],
'content-reject': [],
'content-remove': [],
'description-info': [],
'security-info': [],
- 'session-accept': [self.__on_transport_info],
+ 'session-accept': [self.__on_transport_info,
+ self.__on_content_accept],
'session-info': [],
'session-initiate': [self.__on_transport_info],
'session-terminate': [],
@@ -73,16 +75,21 @@
'iq-result': [],
'iq-error': [],
# these are called when *we* sent these stanzas
- 'content-accept-sent': [self.__fill_jingle_stanza],
+ 'content-accept-sent': [self.__fill_jingle_stanza,
+ self.__on_content_accept],
'content-add-sent': [self.__fill_jingle_stanza],
'session-initiate-sent': [self.__fill_jingle_stanza],
- 'session-accept-sent': [self.__fill_jingle_stanza],
+ 'session-accept-sent': [self.__fill_jingle_stanza,
+ self.__on_content_accept],
'session-terminate-sent': [],
}
def is_ready(self):
return self.accepted and not self.sent
+ def __on_content_accept(self, stanza, content, error, action):
+ self.on_negotiated()
+
def on_negotiated(self):
if self.accepted:
self.negotiated = True
diff -r be31d22c35fd -r c105a89bedc7 src/common/jingle_rtp.py
--- a/src/common/jingle_rtp.py Thu Aug 26 13:52:00 2010 +0200
+++ b/src/common/jingle_rtp.py Thu Aug 26 16:59:29 2010 +0200
@@ -53,12 +53,8 @@
self.callbacks['session-initiate'] += [self.__on_remote_codecs]
self.callbacks['content-add'] += [self.__on_remote_codecs]
self.callbacks['description-info'] += [self.__on_remote_codecs]
- self.callbacks['content-accept'] += [self.__on_remote_codecs,
- self.__on_content_accept]
- self.callbacks['session-accept'] += [self.__on_remote_codecs,
- self.__on_content_accept]
- self.callbacks['session-accept-sent'] += [self.__on_content_accept]
- self.callbacks['content-accept-sent'] += [self.__on_content_accept]
+ self.callbacks['content-accept'] += [self.__on_remote_codecs]
+ self.callbacks['session-accept'] += [self.__on_remote_codecs]
self.callbacks['session-terminate'] += [self.__stop]
self.callbacks['session-terminate-sent'] += [self.__stop]
@@ -234,14 +230,14 @@
def get_fallback_src(self):
return gst.element_factory_make('fakesrc')
- def __on_content_accept(self, stanza, content, error, action):
+ def on_negotiated(self):
if self.accepted:
if self.transport.remote_candidates:
self.p2pstream.set_remote_candidates(self.transport.remote_candidates)
self.transport.remote_candidates = []
# TODO: farsight.DIRECTION_BOTH only if senders='both'
self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH)
- self.on_negotiated()
+ JingleContent.on_negotiated(self)
def __on_remote_codecs(self, stanza, content, error, action):
"""
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
