Missing bits of the last commit (add account parameter to contact constructor)
This commit is contained in:
parent
06129f45ef
commit
dec25246df
|
@ -2540,7 +2540,7 @@ class RosterWindow:
|
||||||
show = roster.getShow(jid+'/'+resource)
|
show = roster.getShow(jid+'/'+resource)
|
||||||
if not show:
|
if not show:
|
||||||
show = 'online'
|
show = 'online'
|
||||||
contact = gajim.contacts.create_contact(jid=jid,
|
contact = gajim.contacts.create_contact(jid=jid, account=account,
|
||||||
name=account, groups=['self_contact'], show=show,
|
name=account, groups=['self_contact'], show=show,
|
||||||
status=roster.getStatus(jid + '/' + resource),
|
status=roster.getStatus(jid + '/' + resource),
|
||||||
resource=resource,
|
resource=resource,
|
||||||
|
|
|
@ -190,7 +190,7 @@ class TestRosterWindowMetaContacts(TestRosterWindowRegrouped):
|
||||||
self.test_fill_roster_model()
|
self.test_fill_roster_model()
|
||||||
|
|
||||||
jid = u'coolstuff@gajim.org'
|
jid = u'coolstuff@gajim.org'
|
||||||
contact = gajim.contacts.create_contact(jid)
|
contact = gajim.contacts.create_contact(jid, account1)
|
||||||
gajim.contacts.add_contact(account1, contact)
|
gajim.contacts.add_contact(account1, contact)
|
||||||
self.roster.add_contact(jid, account1)
|
self.roster.add_contact(jid, account1)
|
||||||
self.roster.chg_contact_status(contact, 'offline', '', account1)
|
self.roster.chg_contact_status(contact, 'offline', '', account1)
|
||||||
|
|
|
@ -55,7 +55,7 @@ class TestGC_Contact(TestCommonContact):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
TestCommonContact.setUp(self)
|
TestCommonContact.setUp(self)
|
||||||
self.contact = GC_Contact("confernce@gajim.org", "account")
|
self.contact = GC_Contact(room_jid="confernce@gajim.org", account="account")
|
||||||
|
|
||||||
def test_attributes_available(self):
|
def test_attributes_available(self):
|
||||||
'''This test supports the migration from the old to the new contact
|
'''This test supports the migration from the old to the new contact
|
||||||
|
|
Loading…
Reference in New Issue