From 3893d4ffa74a855013622c7a53cdd11e0c488a77 Mon Sep 17 00:00:00 2001 From: Dimitur Kirov Date: Tue, 21 Mar 2006 21:46:26 +0000 Subject: [PATCH] resource is shown before status (for consistency with roster tooltip) --- src/tooltips.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/tooltips.py b/src/tooltips.py index 24f198b7b..c7dbbd83e 100644 --- a/src/tooltips.py +++ b/src/tooltips.py @@ -383,6 +383,9 @@ class GCTooltip(BaseTooltip): properties.append((jid_markup, None)) properties.append((_('Role: '), helpers.get_uf_role(contact.role))) 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) if contact.status: status = contact.status.strip() @@ -390,12 +393,7 @@ class GCTooltip(BaseTooltip): # escape markup entities show += ' - ' + gtkgui_helpers.escape_for_pango_markup(status) 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 puny_name = punycode_encode(contact.name) puny_room = punycode_encode(contact.room_jid)