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

use NEC to handle register-agent-info events

This commit is contained in:
Yann Leboulanger 2010-11-29 11:22:27 +01:00
parent e70c49e9ce
commit c25e582887
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/connection.py
View File

@ -897,7 +897,9 @@ class Connection(CommonConnection, ConnectionHandlers):
return return
is_form = data[2] is_form = data[2]
conf = data[1] conf = data[1]
self.dispatch('REGISTER_AGENT_INFO', (data[0], conf, is_form)) gajim.nec.push_incoming_event(RegisterAgentInfoReceivedEvent(
None, conn=self, agent=data[0], config=conf,
is_form=is_form))
elif realm == common.xmpp.NS_PRIVACY: elif realm == common.xmpp.NS_PRIVACY:
if event == common.xmpp.features_nb.PRIVACY_LISTS_RECEIVED: if event == common.xmpp.features_nb.PRIVACY_LISTS_RECEIVED:
# data is (list) # data is (list)

4
src/common/connection_handlers_events.py
View File

@ -1578,3 +1578,7 @@ class FailedDecryptEvent(nec.NetworkIncomingEvent):
class SignedInEvent(nec.NetworkIncomingEvent): class SignedInEvent(nec.NetworkIncomingEvent):
name = 'signed-in' name = 'signed-in'
base_network_events = [] base_network_events = []
class RegisterAgentInfoReceivedEvent(nec.NetworkIncomingEvent):
name = 'register-agent-info-received'
base_network_events = []

14
src/gui_interface.py
View File

@ -546,15 +546,15 @@ class Interface:
notify.popup(event_type, obj.jid, account, 'unsubscribed', path, notify.popup(event_type, obj.jid, account, 'unsubscribed', path,
event_type, obj.jid) event_type, obj.jid)
def handle_event_register_agent_info(self, account, array): def handle_event_register_agent_info(self, obj):
# ('REGISTER_AGENT_INFO', account, (agent, infos, is_form)) # ('REGISTER_AGENT_INFO', account, (agent, infos, is_form))
# info in a dataform if is_form is True # info in a dataform if is_form is True
if array[2] or 'instructions' in array[1]: if obj.is_form or 'instructions' in obj.config:
config.ServiceRegistrationWindow(array[0], array[1], account, config.ServiceRegistrationWindow(obj.agent, obj.config,
array[2]) obj.conn.name, obj.is_form)
else: else:
dialogs.ErrorDialog(_('Contact with "%s" cannot be established') \ dialogs.ErrorDialog(_('Contact with "%s" cannot be established') % \
% array[0], _('Check your connection or try again later.')) obj.agent, _('Check your connection or try again later.'))
def handle_event_agent_info_items(self, account, array): def handle_event_agent_info_items(self, account, array):
#('AGENT_INFO_ITEMS', account, (agent, node, items)) #('AGENT_INFO_ITEMS', account, (agent, node, items))
@ -1388,7 +1388,6 @@ class Interface:
'DB_ERROR': [self.handle_event_db_error], 'DB_ERROR': [self.handle_event_db_error],
'INFORMATION': [self.handle_event_information], 'INFORMATION': [self.handle_event_information],
'MSGERROR': [self.handle_event_msgerror], 'MSGERROR': [self.handle_event_msgerror],
'REGISTER_AGENT_INFO': [self.handle_event_register_agent_info],
'AGENT_INFO_ITEMS': [self.handle_event_agent_info_items], 'AGENT_INFO_ITEMS': [self.handle_event_agent_info_items],
'FILE_REQUEST': [self.handle_event_file_request], 'FILE_REQUEST': [self.handle_event_file_request],
'FILE_REQUEST_ERROR': [self.handle_event_file_request_error], 'FILE_REQUEST_ERROR': [self.handle_event_file_request_error],
@ -1424,6 +1423,7 @@ class Interface:
'password-required': [self.handle_event_password_required], 'password-required': [self.handle_event_password_required],
'plain-connection': [self.handle_event_plain_connection], 'plain-connection': [self.handle_event_plain_connection],
'presence-received': [self.handle_event_presence], 'presence-received': [self.handle_event_presence],
'register-agent-info-received': [self.handle_event_register_agent_info],
'roster-info': [self.handle_event_roster_info], 'roster-info': [self.handle_event_roster_info],
'roster-item-exchange-received': \ 'roster-item-exchange-received': \
[self.handle_event_roster_item_exchange], [self.handle_event_roster_item_exchange],