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

stanza sent at startup now start with Gajim_ instead of p. Fixes #4774

This commit is contained in:
Yann Leboulanger 2009-02-07 12:47:13 +00:00
parent 20edebbd33
commit a4f9764f21
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/connection_handlers.py
View File

@ -766,9 +766,9 @@ class ConnectionDisco:
hostname = gajim.config.get_per('accounts', self.name, hostname = gajim.config.get_per('accounts', self.name,
'hostname') 'hostname')
id_ = iq_obj.getID() id_ = iq_obj.getID()
if jid == hostname and id_[0] == 'p': if jid == hostname and id_[:6] == 'Gajim_':
for item in items: for item in items:
self.discoverInfo(item['jid'], id_prefix='p') self.discoverInfo(item['jid'], id_prefix='Gajim_')
else: else:
self.dispatch('AGENT_INFO_ITEMS', (jid, node, items)) self.dispatch('AGENT_INFO_ITEMS', (jid, node, items))
@ -800,7 +800,7 @@ class ConnectionDisco:
raise common.xmpp.NodeProcessed raise common.xmpp.NodeProcessed
id_ = unicode(iq_obj.getAttr('id')) id_ = unicode(iq_obj.getAttr('id'))
if id_[0] == 'p': if id_[:6] == 'Gajim_':
# We get this request from echo.server # We get this request from echo.server
raise common.xmpp.NodeProcessed raise common.xmpp.NodeProcessed
@ -867,7 +867,7 @@ class ConnectionDisco:
if not identities: # ejabberd doesn't send identities when we browse online users if not identities: # ejabberd doesn't send identities when we browse online users
#FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225 #FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225
identities = [{'category': 'server', 'type': 'im', 'name': node}] identities = [{'category': 'server', 'type': 'im', 'name': node}]
if id_[0] == 'p': if id_[:6] == 'Gajim_':
if jid == gajim.config.get_per('accounts', self.name, 'hostname'): if jid == gajim.config.get_per('accounts', self.name, 'hostname'):
if features.__contains__(common.xmpp.NS_GMAILNOTIFY): if features.__contains__(common.xmpp.NS_GMAILNOTIFY):
gajim.gmail_domains.append(jid) gajim.gmail_domains.append(jid)
@ -2352,9 +2352,9 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
return return
self.connection.getRoster(self._on_roster_set) self.connection.getRoster(self._on_roster_set)
self.discoverItems(gajim.config.get_per('accounts', self.name, self.discoverItems(gajim.config.get_per('accounts', self.name,
'hostname'), id_prefix='p') 'hostname'), id_prefix='Gajim_')
self.discoverInfo(gajim.config.get_per('accounts', self.name, self.discoverInfo(gajim.config.get_per('accounts', self.name,
'hostname'), id_prefix='p') 'hostname'), id_prefix='Gajim_')
if gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): if gajim.config.get_per('accounts', self.name, 'use_ft_proxies'):
self.discover_ft_proxies() self.discover_ft_proxies()