* Make tooltip behave if we're not yet connected when it appears, or if we're the only resource online.
This commit is contained in:
parent
b90d56cf17
commit
c8059fd3fa
|
@ -673,7 +673,11 @@ 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 = []
|
||||||
for resource in gajim.connections[account].connection.getRoster().getResources(jid)+[gajim.config.get_per('accounts', gajim.connections[account].name, 'resource')]:
|
resources = [gajim.config.get_per('accounts', gajim.connections[account].name, 'resource')]
|
||||||
|
if gajim.connections[account].connection:
|
||||||
|
if gajim.connections[account].connection.getRoster().getItem(jid):
|
||||||
|
resources = resources + gajim.connections[account].connection.getRoster().getResources(jid)
|
||||||
|
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].get_status(), status=gajim.connections[account].status, resource=resource, keyID = gajim.config.get_per('accounts', gajim.connections[account].name, 'keyid'))
|
||||||
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]:
|
||||||
|
|
Loading…
Reference in New Issue