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

detect gc presences in a batter way

This commit is contained in:
Yann Leboulanger 2005-09-28 15:24:26 +00:00
parent a8117faf2d
commit c0ccc81252
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/connection.py
View File

@ -331,13 +331,14 @@ class Connection:
def _presenceCB(self, con, prs): def _presenceCB(self, con, prs):
"""Called when we receive a presence""" """Called when we receive a presence"""
ptype = prs.getType() ptype = prs.getType()
if ptype == 'available': ptype = None if ptype == 'available':
ptype = None
gajim.log.debug('PresenceCB: %s' % ptype) gajim.log.debug('PresenceCB: %s' % ptype)
is_gc = False # is it a GC presence ? is_gc = False # is it a GC presence ?
sigTag = None sigTag = None
xtags = prs.getTags('x') xtags = prs.getTags('x')
for x in xtags: for x in xtags:
if x.getNamespace() == common.xmpp.NS_MUC_USER: if x.getNamespace().startswith(common.xmpp.NS_MUC):
is_gc = True is_gc = True
if x.getNamespace() == common.xmpp.NS_SIGNED: if x.getNamespace() == common.xmpp.NS_SIGNED:
sigTag = x sigTag = x
@ -392,7 +393,7 @@ class Connection:
_('You are not in the members list.'))) _('You are not in the members list.')))
elif errcode == '409': # nick conflict elif errcode == '409': # nick conflict
# the jid_from in this case is FAKE JID: room_jid/nick # the jid_from in this case is FAKE JID: room_jid/nick
room_jid = gajim.get_room_from_fjid(jid_from) room_jid = gajim.get_room_from_fjid(who)
self.dispatch('ASK_NEW_NICK', (room_jid, _('Unable to join room'), self.dispatch('ASK_NEW_NICK', (room_jid, _('Unable to join room'),
_('Your desired nickname is in use or registered by another occupant. Please use another:'))) _('Your desired nickname is in use or registered by another occupant. Please use another:')))
else: # print in the window the error else: # print in the window the error