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

prevent TB from previous commit

This commit is contained in:
Dimitur Kirov 2006-07-20 08:48:29 +00:00
parent ba3ac3a592
commit dc29f1d744
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gajim.py
View File

@ -397,17 +397,16 @@ class Interface:
if not contact1: if not contact1:
# presence of another resource of out jid # presence of another resource of out jid
if resource == gajim.connections[account].server_resource: if resource == gajim.connections[account].server_resource:
resource = gajim.config.get_per('accounts', account, 'resource') return
else: contact1 = gajim.contacts.create_contact(jid = ji,
contact1 = gajim.contacts.create_contact(jid = ji, name = gajim.nicks[account], groups = [],
name = gajim.nicks[account], groups = [], show = array[1], status = status_message, sub = 'both',
show = array[1], status = status_message, sub = 'both', ask = 'none', priority = priority, keyID = keyID,
ask = 'none', priority = priority, keyID = keyID, resource = resource)
resource = resource) old_show = 0
old_show = 0 gajim.contacts.add_contact(account, contact1)
gajim.contacts.add_contact(account, contact1) lcontact.append(contact1)
lcontact.append(contact1) self.roster.add_self_contact(account)
self.roster.add_self_contact(account)
elif contact1.show in statuss: elif contact1.show in statuss:
old_show = statuss.index(contact1.show) old_show = statuss.index(contact1.show)
if (resources != [''] and (len(lcontact) != 1 or if (resources != [''] and (len(lcontact) != 1 or