From 345ab7846dd36ece66b149563f3720b49eb85e80 Mon Sep 17 00:00:00 2001
From: Jean-Marie Traissard <jim@lapin.org>
Date: Thu, 12 Oct 2006 02:44:15 +0000
Subject: [PATCH] Correct tooltips after zeroconf merge. Fixes #2554.
---
src/tooltips.py | 37 +++++++------------------------------
1 file changed, 7 insertions(+), 30 deletions(-)
diff --git a/src/tooltips.py b/src/tooltips.py
index c7af32975e..6f7a2d2451 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -307,14 +307,8 @@ class GCTooltip(BaseTooltip):
properties.append((show, None))
if contact.jid.strip() != '':
- jid_markup = '<span weight="bold">' + contact.jid + '</span>'
- else:
- jid_markup = '<span weight="bold">' + \
- gtkgui_helpers.escape_for_pango_markup(contact.get_shown_name()) \
- + '</span>'
- properties.append((jid_markup, None))
- properties.append((_('Role: '), helpers.get_uf_role(contact.role)))
- properties.append((_('Affiliation: '), contact.affiliation.capitalize()))
+ properties.append((_('JID: '), contact.jid))
+
if hasattr(contact, 'resource') and contact.resource.strip() != '':
properties.append((_('Resource: '),
gtkgui_helpers.escape_for_pango_markup(contact.resource) ))
@@ -416,25 +410,12 @@ class RosterTooltip(NotificationAreaTooltip):
vcard_table.set_homogeneous(False)
vcard_current_row = 1
properties = []
-
- jid_markup = '<span weight="bold">' + prim_contact.jid + '</span>'
- properties.append((jid_markup, None))
-
- properties.append((_('Name: '), gtkgui_helpers.escape_for_pango_markup(
- prim_contact.get_shown_name())))
- if prim_contact.sub:
- properties.append(( _('Subscription: '),
- gtkgui_helpers.escape_for_pango_markup(helpers.get_uf_sub(prim_contact.sub))))
- if prim_contact.keyID:
- keyID = None
- if len(prim_contact.keyID) == 8:
- keyID = prim_contact.keyID
- elif len(prim_contact.keyID) == 16:
- keyID = prim_contact.keyID[8:]
- if keyID:
- properties.append((_('OpenPGP: '),
- gtkgui_helpers.escape_for_pango_markup(keyID)))
+ name_markup = u'<span weight="bold">' + \
+ gtkgui_helpers.escape_for_pango_markup(prim_contact.get_shown_name())\
+ + '</span>'
+ properties.append((name_markup, None))
+
num_resources = 0
# put contacts in dict, where key is priority
contacts_dict = {}
@@ -446,10 +427,6 @@ class RosterTooltip(NotificationAreaTooltip):
else:
contacts_dict[contact.priority] = [contact]
- if num_resources == 1 and contact.resource:
- properties.append((_('Resource: '),
- gtkgui_helpers.escape_for_pango_markup(contact.resource) + ' (' + \
- unicode(contact.priority) + ')'))
if num_resources > 1:
properties.append((_('Status: '), ' '))
transport = gajim.get_transport_name_from_jid(
--
GitLab