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

Get information about self-contact from the right place, instead of just copying the current account status/priority

This commit is contained in:
Alex Mauer 2005-09-14 17:17:19 +00:00
parent 948d0a93e4
commit 52e076e4c4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/roster_window.py
View File

@ -673,13 +673,14 @@ class RosterWindow:
account = model[iter][C_NAME].decode('utf-8') account = model[iter][C_NAME].decode('utf-8')
jid = gajim.get_jid_from_account(account) jid = gajim.get_jid_from_account(account)
contacts = [] contacts = []
resources = [gajim.config.get_per('accounts', gajim.connections[account].name, 'resource')] contact = Contact(jid=jid, name=account, show=gajim.connections[account].get_status(), status=gajim.connections[account].status, resource=gajim.config.get_per('accounts', gajim.connections[account].name, 'resource'), keyID=gajim.config.get_per('accounts', gajim.connections[account].name, 'keyid'))
contacts.append(contact)
if gajim.connections[account].connection: if gajim.connections[account].connection:
if gajim.connections[account].connection.getRoster().getItem(jid): if gajim.connections[account].connection.getRoster().getItem(jid):
resources = resources + gajim.connections[account].connection.getRoster().getResources(jid) resources = gajim.connections[account].connection.getRoster().getResources(jid)
for resource in resources: for resource in resources:
contact = Contact(jid=jid, name=account, show=gajim.connections[account].get_status(), status=gajim.connections[account].status, resource=resource, keyID = gajim.config.get_per('accounts', gajim.connections[account].name, 'keyid')) contact = Contact(jid=jid, name=account, show=gajim.connections[account].connection.getRoster().getShow(jid+'/'+resource), status=gajim.connections[account].connection.getRoster().getStatus(jid+'/'+resource), resource=resource, priority=gajim.connections[account].connection.getRoster().getPriority(jid+'/'+resource))
contacts.append(contact) contacts.append(contact)
if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: if self.tooltip.timeout == 0 or self.tooltip.id != props[0]:
self.tooltip.id = row self.tooltip.id = row
self.tooltip.timeout = gobject.timeout_add(500, self.tooltip.timeout = gobject.timeout_add(500,