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

use gajim.get_jid_from_account in some places

Browse source
This commit is contained in:
Nikos Kouremenos 2005-09-09 21:15:41 +00:00
parent e76e254650
commit 0bf0c36323
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/connection.py
View file

@ -185,9 +185,7 @@ class Connection:
"""Called when we receive a vCard """Called when we receive a vCard
Parse the vCard and send it to plugins""" Parse the vCard and send it to plugins"""
frm_iq = vc.getFrom() frm_iq = vc.getFrom()
name = gajim.config.get_per('accounts', self.name, 'name') our_jid = gajim.get_jid_from_account(self.name)
hostname = gajim.config.get_per('accounts', self.name, 'hostname')
our_jid = name + '@' + hostname
resource = '' resource = ''
if frm_iq: if frm_iq:
frm = frm_iq.getStripped() frm = frm_iq.getStripped()
@ -1133,10 +1131,10 @@ class Connection:
if not roster: if not roster:
roster = {} roster = {}
name = gajim.config.get_per('accounts', self.name, 'name') jid = gajim.get_jid_from_account(self.name)
hostname = gajim.config.get_per('accounts', self.name, 'hostname')
if roster.has_key(name + '@' + hostname): if roster.has_key(jid):
del roster[name + '@' + hostname] del roster[jid]
self.dispatch('ROSTER', roster) self.dispatch('ROSTER', roster)
#continue connection #continue connection