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

use nec to handle version requests

This commit is contained in:
Yann Leboulanger 2010-08-16 23:39:33 +02:00
parent 751894d453
commit f66baccf3b
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/connection_handlers.py
View File

@ -1080,6 +1080,8 @@ ConnectionJingle, ConnectionIBBytestream):
gajim.ged.register_event_handler('http-auth-received', ged.CORE, gajim.ged.register_event_handler('http-auth-received', ged.CORE,
self._nec_http_auth_received) self._nec_http_auth_received)
gajim.ged.register_event_handler('version-request-received', ged.CORE,
self._nec_version_request_received)
def build_http_auth_answer(self, iq_obj, answer): def build_http_auth_answer(self, iq_obj, answer):
if not self.connection or self.connected < 2: if not self.connection or self.connected < 2:
@ -1258,7 +1260,14 @@ ConnectionJingle, ConnectionIBBytestream):
log.debug('VersionCB') log.debug('VersionCB')
if not self.connection or self.connected < 2: if not self.connection or self.connected < 2:
return return
iq_obj = iq_obj.buildReply('result') gajim.nec.push_incoming_event(VersionRequestEvent(None,
conn=self, iq_obj=iq_obj))
raise common.xmpp.NodeProcessed
def _nec_version_request_received(self, obj):
if obj.conn.name != self.name:
return
iq_obj = obj.iq_obj.buildReply('result')
qp = iq_obj.getTag('query') qp = iq_obj.getTag('query')
qp.setTagData('name', 'Gajim') qp.setTagData('name', 'Gajim')
qp.setTagData('version', gajim.version) qp.setTagData('version', gajim.version)
@ -1266,7 +1275,6 @@ ConnectionJingle, ConnectionIBBytestream):
if send_os: if send_os:
qp.setTagData('os', helpers.get_os_info()) qp.setTagData('os', helpers.get_os_info())
self.connection.send(iq_obj) self.connection.send(iq_obj)
raise common.xmpp.NodeProcessed
def _LastCB(self, con, iq_obj): def _LastCB(self, con, iq_obj):
global HAS_IDLE global HAS_IDLE
@ -2665,3 +2673,15 @@ class RosterItemExchangeEvent(nec.NetworkIncomingEvent, HelperEvent):
self.exchange_items_list[jid].append(groups) self.exchange_items_list[jid].append(groups)
if exchange_items_list: if exchange_items_list:
return True return True
class VersionRequestEvent(nec.NetworkIncomingEvent):
name = 'version-request-received'
base_network_events = []
def generate(self):
if not self.conn:
self.conn = self.base_event.conn
if not self.iq_obj:
self.iq_obj = self.base_event.xmpp_iq
return True