Philipp Hörist pushed to branch master at gajim / gajim

Commits: e7eb929b by Daniel Brötzmann at 2020-07-22T11:33:59+02:00 ChatControl: Fix Jingle session termination

- - - - - d8982bb6 by Daniel Brötzmann at 2020-07-22T11:33:59+02:00 Jingle A/V: Log used codec

- - - - -

2 changed files:

- gajim/chat_control.py - gajim/common/jingle_rtp.py

Changes:

===================================== gajim/chat_control.py ===================================== @@ -765,7 +765,7 @@ class ChatControl(ChatControlBase): new_sid = None if jingle_state == self.JINGLE_STATE_NULL: new_sid = None - if state in ('connection_received', 'connecting'): + if state in ('connection_received', 'connecting', 'connected'): new_sid = sid

jingle.state = jingle_state @@ -888,9 +888,6 @@ class ChatControl(ChatControlBase): if not jingle.sid: return

- jingle.sid = None - jingle.state = self.JINGLE_STATE_NULL - con = app.connections[self.account] session = con.get_module('Jingle').get_jingle_session( self.contact.get_full_jid(), jingle.sid) @@ -898,6 +895,10 @@ class ChatControl(ChatControlBase): content = session.get_content(jingle_type) if content: session.remove_content(content.creator, content.name) + + jingle.sid = None + jingle.state = self.JINGLE_STATE_NULL + var = GLib.Variant.new_boolean(False)

jingle.action.change_state(var)

===================================== gajim/common/jingle_rtp.py ===================================== @@ -182,6 +182,7 @@ class JingleRTPContent(JingleContent): self.funnel.set_state(Gst.State.PLAYING)

def _on_src_pad_added(self, stream, pad, codec): + log.info('Used codec: %s', codec.to_string()) if not self.funnel: self._setup_funnel() pad.link(self.funnel.get_request_pad('sink_%u'))

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bfb023d3182be3a7e5aaedf461efac91...