changeset cc607e4378ba in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cc607e4378ba description: fix some bugs with non-normalized jids
diffstat: src/common/connection_handlers.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diffs (84 lines): diff -r d1f8de8f7da8 -r cc607e4378ba src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jul 07 14:27:55 2009 +0200 +++ b/src/common/connection_handlers.py Tue Jul 07 16:34:46 2009 +0200 @@ -484,7 +484,7 @@ gajim.socks5queue.activate_proxy(host['idx']) break raise common.xmpp.NodeProcessed - jid = streamhost.getAttr('jid') + jid = gajim.parse_jid(streamhost.getAttr('jid')) if 'streamhost-used' in file_props and \ file_props['streamhost-used'] is True: raise common.xmpp.NodeProcessed @@ -1122,7 +1122,7 @@ storage = query.getTag('storage') metas = storage.getTags('meta') for meta in metas: - jid = meta.getAttr('jid') + jid = gajim.parse_jid(meta.getAttr('jid')) tag = meta.getAttr('tag') data = {'jid': jid} order = meta.getAttr('order') @@ -1483,7 +1483,7 @@ if not print_status: print_status = conf.getTagData('show_status') bm = {'name': conf.getAttr('name'), - 'jid': conf.getAttr('jid'), + 'jid': gajim.parse_jid(conf.getAttr('jid')), 'autojoin': autojoin_val, 'minimize': minimize_val, 'password': conf.getTagData('password'), @@ -1503,7 +1503,7 @@ # http://www.xmpp.org/extensions/xep-0145.html notes = storage.getTags('note') for note in notes: - jid = note.getAttr('jid') + jid = gajim.parse_jid(note.getAttr('jid')) annotation = note.getData() self.annotations[jid] = annotation @@ -1718,7 +1718,7 @@ if addressTag and jid == gajim.get_jid_from_account(self.name): address = addressTag.getTag('address', attrs={'type': 'ofrom'}) if address: - frm = address.getAttr('jid') + frm = gajim.parse_jid(address.getAttr('jid')) jid = gajim.get_jid_without_resource(frm) # invitations @@ -1736,7 +1736,7 @@ xtags = msg.getTags('x') for xtag in xtags: if xtag.getNamespace() == common.xmpp.NS_CONFERENCE and not invite: - room_jid = xtag.getAttr('jid') + room_jid = gajim.parse_jid(xtag.getAttr('jid')) is_continued = False if xtag.getTag('continue'): is_continued = True @@ -1923,7 +1923,7 @@ def dispatch_invite_message(self, invite, frm): item = invite.getTag('invite') - jid_from = item.getAttr('from') + jid_from = gajim.parse_jid(item.getAttr('from')) reason = item.getTagData('reason') item = invite.getTag('password') password = invite.getTagData('password') @@ -2127,7 +2127,7 @@ r = destroy.getTagData('reason') if r: reason += ' (%s)' % r - jid = destroy.getAttr('jid') + jid = gajim.parse_jid(destroy.getAttr('jid')) if jid: reason += '\n' + _('You can join this room instead: %s') % jid statusCode = ['destroyed'] @@ -2274,7 +2274,7 @@ users_dict = {} for item in items: if item.has_attr('jid') and item.has_attr('affiliation'): - jid = item.getAttr('jid') + jid = gajim.parse_jid(item.getAttr('jid')) affiliation = item.getAttr('affiliation') users_dict[jid] = {'affiliation': affiliation} if item.has_attr('nick'): _______________________________________________ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits