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

disco our transports when we connect if we ca't determine the type (not in db). Fixes #2273

This commit is contained in:
Yann Leboulanger 2006-09-07 20:39:09 +00:00
parent 29cef733f2
commit dfead3a31c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/connection_handlers.py
View File

@ -1772,13 +1772,18 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco)
print >> sys.stderr, _('JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it') % jid print >> sys.stderr, _('JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it') % jid
else: else:
infos = raw_roster[jid] infos = raw_roster[jid]
if jid != our_jid and (not infos['subscription'] or infos['subscription'] == \ if jid != our_jid and (not infos['subscription'] or \
'none') and (not infos['ask'] or infos['ask'] == 'none') and not infos['name'] \ infos['subscription'] == 'none') and (not infos['ask'] or \
and not infos['groups']: infos['ask'] == 'none') and not infos['name'] and \
not infos['groups']:
# remove this useless item, it won't be shown in roster anyway # remove this useless item, it won't be shown in roster anyway
self.connection.getRoster().delItem(jid) self.connection.getRoster().delItem(jid)
elif jid != our_jid: # don't add our jid elif jid != our_jid: # don't add our jid
roster[j] = raw_roster[jid] roster[j] = raw_roster[jid]
if gajim.jid_is_transport(jid) and \
not gajim.get_transport_name_from_jid(jid):
# we can't determine which iconset to use
self.discoverInfo(jid)
self.dispatch('ROSTER', roster) self.dispatch('ROSTER', roster)