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

use NEC to handle jingle-error events

This commit is contained in:
Yann Leboulanger 2010-11-05 11:08:06 +01:00
parent cbe9cbcdd3
commit 989e606672
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/connection_handlers_events.py
View File

@ -1143,3 +1143,13 @@ class JingleDisconnectedReceivedEvent(nec.NetworkIncomingEvent):
self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid)
self.sid = self.jingle_session.sid self.sid = self.jingle_session.sid
return True return True
class JingleErrorReceivedEvent(nec.NetworkIncomingEvent):
name = 'jingle-error-received'
base_network_events = []
def generate(self):
self.fjid = self.jingle_session.peerjid
self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid)
self.sid = self.jingle_session.sid
return True

5
src/common/jingle_session.py
View File

@ -534,8 +534,9 @@ class JingleSession(object):
if text: if text:
text = '%s (%s)' % (error, text) text = '%s (%s)' % (error, text)
if type_ != 'modify': if type_ != 'modify':
self.connection.dispatch('JINGLE_ERROR', gajim.nec.push_incoming_event(JingleErrorReceivedEvent(None,
(self.peerjid, self.sid, text or error)) conn=self.connection, jingle_session=self,
reason=text or error))
def __reason_from_stanza(self, stanza): def __reason_from_stanza(self, stanza):
# TODO: Move to GUI? # TODO: Move to GUI?

14
src/gui_interface.py
View File

@ -1585,15 +1585,13 @@ class Interface:
else: else:
dialog.remove_contents((obj.media, )) dialog.remove_contents((obj.media, ))
def handle_event_jingle_error(self, account, data): def handle_event_jingle_error(self, obj):
# ('JINGLE_ERROR', account, (peerjid, sid, reason)) # ('JINGLE_ERROR', account, (peerjid, sid, reason))
peerjid, sid, reason = data account = obj.conn.name
jid = gajim.get_jid_without_resource(peerjid) ctrl = (self.msg_win_mgr.get_control(obj.fjid, account)
resource = gajim.get_resource_from_jid(peerjid) or self.msg_win_mgr.get_control(obj.jid, account))
ctrl = (self.msg_win_mgr.get_control(peerjid, account)
or self.msg_win_mgr.get_control(jid, account))
if ctrl: if ctrl:
ctrl.set_audio_state('error', reason=reason) ctrl.set_audio_state('error', reason=obj.reason)
def handle_event_pep_config(self, account, data): def handle_event_pep_config(self, account, data):
# ('PEP_CONFIG', account, (node, form)) # ('PEP_CONFIG', account, (node, form))
@ -1899,7 +1897,6 @@ class Interface:
'INSECURE_SSL_CONNECTION': \ 'INSECURE_SSL_CONNECTION': \
[self.handle_event_insecure_ssl_connection], [self.handle_event_insecure_ssl_connection],
'INSECURE_PASSWORD': [self.handle_event_insecure_password], 'INSECURE_PASSWORD': [self.handle_event_insecure_password],
'JINGLE_ERROR': [self.handle_event_jingle_error],
'PEP_RECEIVED': [self.handle_event_pep_received], 'PEP_RECEIVED': [self.handle_event_pep_received],
'CAPS_RECEIVED': [self.handle_event_caps_received], 'CAPS_RECEIVED': [self.handle_event_caps_received],
'ARCHIVING_CHANGED': [self.handle_event_archiving_changed], 'ARCHIVING_CHANGED': [self.handle_event_archiving_changed],
@ -1913,6 +1910,7 @@ class Interface:
'jingle-connected-received': [self.handle_event_jingle_connected], 'jingle-connected-received': [self.handle_event_jingle_connected],
'jingle-disconnected-received': [ 'jingle-disconnected-received': [
self.handle_event_jingle_disconnected], self.handle_event_jingle_disconnected],
'jingle-error-received': [self.handle_event_jingle_error],
'jingle-request-received': [self.handle_event_jingle_incoming], 'jingle-request-received': [self.handle_event_jingle_incoming],
'last-result-received': [self.handle_event_last_status_time], 'last-result-received': [self.handle_event_last_status_time],
'muc-admin-received': [self.handle_event_gc_affiliation], 'muc-admin-received': [self.handle_event_gc_affiliation],