resource is shown before status (for
consistency with roster tooltip)
This commit is contained in:
parent
f01fd88ff5
commit
3893d4ffa7
|
@ -383,6 +383,9 @@ class GCTooltip(BaseTooltip):
|
||||||
properties.append((jid_markup, None))
|
properties.append((jid_markup, None))
|
||||||
properties.append((_('Role: '), helpers.get_uf_role(contact.role)))
|
properties.append((_('Role: '), helpers.get_uf_role(contact.role)))
|
||||||
properties.append((_('Affiliation: '), contact.affiliation.capitalize()))
|
properties.append((_('Affiliation: '), contact.affiliation.capitalize()))
|
||||||
|
if hasattr(contact, 'resource') and contact.resource.strip() != '':
|
||||||
|
properties.append((_('Resource: '),
|
||||||
|
gtkgui_helpers.escape_for_pango_markup(contact.resource) ))
|
||||||
show = helpers.get_uf_show(contact.show)
|
show = helpers.get_uf_show(contact.show)
|
||||||
if contact.status:
|
if contact.status:
|
||||||
status = contact.status.strip()
|
status = contact.status.strip()
|
||||||
|
@ -390,12 +393,7 @@ class GCTooltip(BaseTooltip):
|
||||||
# escape markup entities
|
# escape markup entities
|
||||||
show += ' - ' + gtkgui_helpers.escape_for_pango_markup(status)
|
show += ' - ' + gtkgui_helpers.escape_for_pango_markup(status)
|
||||||
properties.append((_('Status: '), show))
|
properties.append((_('Status: '), show))
|
||||||
if hasattr(contact, 'resource') and contact.resource.strip() != '':
|
|
||||||
properties.append((_('Resource: '),
|
|
||||||
gtkgui_helpers.escape_for_pango_markup(contact.resource) ))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Add avatar
|
# Add avatar
|
||||||
puny_name = punycode_encode(contact.name)
|
puny_name = punycode_encode(contact.name)
|
||||||
puny_room = punycode_encode(contact.room_jid)
|
puny_room = punycode_encode(contact.room_jid)
|
||||||
|
|
Loading…
Reference in New Issue