changeset be31d22c35fd in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=be31d22c35fd description: [Jingle] Don't wait for all contents to be ready to accept a session

diffstat:

src/common/jingle_session.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r b9926e6d6599 -r be31d22c35fd src/common/jingle_session.py --- a/src/common/jingle_session.py Tue Aug 24 11:43:16 2010 +0200 +++ b/src/common/jingle_session.py Thu Aug 26 13:52:00 2010 +0200 @@ -229,7 +229,7 @@ """ Return True when all codecs and candidates are ready (for all contents) """ - return (all((content.is_ready() for content in self.contents.itervalues())) + return (any((content.is_ready() for content in self.contents.itervalues())) and self.accepted)

def accept_session(self): @@ -592,7 +592,8 @@ # TODO: integrate with __appendContent? # TODO: parameters 'name', 'content'? for content in self.contents.values(): - self.__append_content(jingle, content) + if content.is_ready(): + self.__append_content(jingle, content)

def __session_initiate(self): assert self.state == JingleStates.ended