copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

close jingle sessions when we close chat control. Fixes #5541

Browse source
This commit is contained in:
Yann Leboulanger 2010-01-05 22:14:52 +01:00
parent d712a2d879
commit 59e7d8de8e
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/chat_control.py
View file

@ -1845,6 +1845,14 @@ class ChatControl(ChatControlBase):
banner_name_label.set_markup(label_text) banner_name_label.set_markup(label_text)
banner_name_label.set_tooltip_text(label_tooltip) banner_name_label.set_tooltip_text(label_tooltip)
def close_jingle_content(self, jingle_type):
session = gajim.connections[self.account].get_jingle_session(
self.contact.get_full_jid(), getattr(self, jingle_type + '_sid'))
if session:
content = session.get_content(jingle_type)
if content:
session.remove_content(content.creator, content.name)
def on_jingle_button_toggled(self, widget, jingle_type): def on_jingle_button_toggled(self, widget, jingle_type):
img_name = 'gajim-%s_%s' % ({'audio': 'mic', 'video': 'cam'}[jingle_type], img_name = 'gajim-%s_%s' % ({'audio': 'mic', 'video': 'cam'}[jingle_type],
{True: 'active', False: 'inactive'}[widget.get_active()]) {True: 'active', False: 'inactive'}[widget.get_active()])
@ -1857,12 +1865,7 @@ class ChatControl(ChatControlBase):
'start_' + jingle_type)(self.contact.get_full_jid()) 'start_' + jingle_type)(self.contact.get_full_jid())
getattr(self, 'set_' + jingle_type + '_state')('connecting', sid) getattr(self, 'set_' + jingle_type + '_state')('connecting', sid)
else: else:
session = gajim.connections[self.account].get_jingle_session( self.close_jingle_content(jingle_type)
self.contact.get_full_jid(), getattr(self, jingle_type + '_sid'))
if session:
content = session.get_content(jingle_type)
if content:
session.remove_content(content.creator, content.name)
img = getattr(self, '_' + jingle_type + '_button').get_property('image') img = getattr(self, '_' + jingle_type + '_button').get_property('image')
img.set_from_file(path_to_img) img.set_from_file(path_to_img)
@ -2367,6 +2370,9 @@ class ChatControl(ChatControlBase):
self.contact.chatstate = None self.contact.chatstate = None
self.contact.our_chatstate = None self.contact.our_chatstate = None
for jingle_type in ('audio', 'video'):
self.close_jingle_content(jingle_type)
# disconnect self from session # disconnect self from session
if self.session: if self.session:
self.session.control = None self.session.control = None