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

Fixes an indentation error aswell as the previous commit

This commit is contained in:
Thibaut GIRKA 2009-10-16 20:21:42 +02:00
parent d495deaa02
commit 313f002958
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/chat_control.py
View File

@ -1600,6 +1600,12 @@ class ChatControl(ChatControlBase):
if state in states: if state in states:
self.audio_state = states[state] self.audio_state = states[state]
# Destroy existing session with the user when he signs off
# We need to do that before modifying the sid
if state == 'not_available':
gajim.connections[self.account].delete_jingle_session(
self.contact.get_full_jid(), self.audio_sid)
if state in ('not_available', 'available', 'stop'): if state in ('not_available', 'available', 'stop'):
self.audio_sid = None self.audio_sid = None
if state in ('connection_received', 'connecting'): if state in ('connection_received', 'connecting'):
@ -1610,16 +1616,11 @@ class ChatControl(ChatControlBase):
elif state in ('not_available', 'stop'): elif state in ('not_available', 'stop'):
self._audio_button.set_active(False) self._audio_button.set_active(False)
# Destroy existing session with the user when he signs off
if state == 'not_available':
gajim.connections[self.account].delete_jingle_session(
self.contact.get_full_jid(), self.audio_sid)
self.update_audio() self.update_audio()
def set_video_state(self, state, sid=None, reason=None): def set_video_state(self, state, sid=None, reason=None):
#TODO: Share code with set_audio_state? #TODO: Share code with set_audio_state?
if state in ('connecting', 'connected', 'stop'): if state in ('connecting', 'connected', 'stop'):
str = _('Video state : %s') % state str = _('Video state : %s') % state
if reason: if reason:
str += ', ' + _('reason: %s') % reason str += ', ' + _('reason: %s') % reason
@ -1636,6 +1637,12 @@ class ChatControl(ChatControlBase):
if state in states: if state in states:
self.video_state = states[state] self.video_state = states[state]
# Destroy existing session with the user when he signs off
# We need to do that before modifying the sid
if state == 'not_available':
gajim.connections[self.account].delete_jingle_session(
self.contact.get_full_jid(), self.video_sid)
if state in ('not_available', 'available', 'stop'): if state in ('not_available', 'available', 'stop'):
self.video_sid = None self.video_sid = None
if state in ('connection_received', 'connecting'): if state in ('connection_received', 'connecting'):
@ -1646,11 +1653,6 @@ class ChatControl(ChatControlBase):
elif state in ('not_available', 'stop'): elif state in ('not_available', 'stop'):
self._video_button.set_active(False) self._video_button.set_active(False)
# Destroy existing session with the user when he signs off
if state == 'not_available':
gajim.connections[self.account].delete_jingle_session(
self.contact.get_full_jid(), self.video_sid)
self.update_video() self.update_video()
def on_avatar_eventbox_enter_notify_event(self, widget, event): def on_avatar_eventbox_enter_notify_event(self, widget, event):