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

discover server feature in first when connecting

This commit is contained in:
Yann Leboulanger 2009-07-31 13:47:47 +02:00
parent ec71c7d7c2
commit 66254bc47f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/connection.py
View File

@ -207,7 +207,7 @@ class Connection(ConnectionHandlers):
self.connected = 1
self.dispatch('STATUS', 'connecting')
self.retrycount += 1
self.on_connect_auth = self._init_roster
self.on_connect_auth = self._discover_server_at_connection
self.connect_and_init(self.old_show, self.status, self.USE_GPG)
else:
# reconnect succeeded
@ -1022,16 +1022,20 @@ class Connection(ConnectionHandlers):
def connect_and_init(self, show, msg, sign_msg):
self.continue_connect_info = [show, msg, sign_msg]
self.on_connect_auth = self._init_roster
self.on_connect_auth = self._discover_server_at_connection
self.connect_and_auth()
def _init_roster(self, con):
def _discover_server_at_connection(self, con):
self.connection = con
if not self.connection:
return
self.connection.set_send_timeout(self.keepalives, self.send_keepalive)
self.connection.set_send_timeout2(self.pingalives, self.sendPing)
self.connection.onreceive(None)
self.discoverInfo(gajim.config.get_per('accounts', self.name, 'hostname'),
id_prefix='Gajim_')
def _request_privacy(self):
iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '')
id_ = self.connection.getAnID()
iq.setID(id_)

3
src/common/connection_handlers.py
View File

@ -912,6 +912,7 @@ class ConnectionDisco:
self.available_transports[transport_type].append(jid)
else:
self.available_transports[transport_type] = [jid]
self._request_privacy()
self.dispatch('AGENT_INFO_INFO', (jid, node, identities,
features, data))
@ -2519,8 +2520,6 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
self.connection.getRoster(self._on_roster_set)
self.discoverItems(gajim.config.get_per('accounts', self.name,
'hostname'), id_prefix='Gajim_')
self.discoverInfo(gajim.config.get_per('accounts', self.name,
'hostname'), id_prefix='Gajim_')
if gajim.config.get_per('accounts', self.name, 'use_ft_proxies'):
self.discover_ft_proxies()