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

do not show status icon on acct row tooltip. fixes #1613

This commit is contained in:
Nikos Kouremenos 2006-02-26 14:13:59 +00:00
parent db6f6151a1
commit b2cde9b6ba
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tooltips.py
View File

@ -394,7 +394,7 @@ class RosterTooltip(NotificationAreaTooltip):
# primary contact # primary contact
prim_contact = gajim.contacts.get_highest_prio_contact_from_contacts( prim_contact = gajim.contacts.get_highest_prio_contact_from_contacts(
contacts) contacts)
# try to find the image for the contact status # try to find the image for the contact status
icon_name = helpers.get_icon_name_to_show(prim_contact) icon_name = helpers.get_icon_name_to_show(prim_contact)
state_file = icon_name.replace(' ', '_') state_file = icon_name.replace(' ', '_')
@ -435,6 +435,9 @@ class RosterTooltip(NotificationAreaTooltip):
info += '\n<span weight="bold">' + _('OpenPGP: ') + \ info += '\n<span weight="bold">' + _('OpenPGP: ') + \
'</span>' + gtkgui_helpers.escape_for_pango_markup(keyID) '</span>' + gtkgui_helpers.escape_for_pango_markup(keyID)
our_jids = gajim.get_our_jids()
num_resources = 0 num_resources = 0
for contact in contacts: for contact in contacts:
if contact.resource: if contact.resource:
@ -444,7 +447,9 @@ class RosterTooltip(NotificationAreaTooltip):
self.table.resize(2,1) self.table.resize(2,1)
info += '\n<span weight="bold">' + _('Status: ') + '</span>' info += '\n<span weight="bold">' + _('Status: ') + '</span>'
for contact in contacts: for contact in contacts:
if contact.resource: # only if we have resource and it's not us add resources info and
# images
if contact.resource and contact.jid not in our_jids:
status_line = self.get_status_info(contact.resource, status_line = self.get_status_info(contact.resource,
contact.priority, contact.show, contact.status) contact.priority, contact.show, contact.status)
icon_name = helpers.get_icon_name_to_show(contact) icon_name = helpers.get_icon_name_to_show(contact)
@ -490,7 +495,9 @@ class RosterTooltip(NotificationAreaTooltip):
else: else:
self.avatar_image.set_from_pixbuf(None) self.avatar_image.set_from_pixbuf(None)
self.text_label.set_markup(info) self.text_label.set_markup(info)
self.hbox.pack_start(self.image, False, False)
if prim_contact.jid not in our_jids: # do not add image if it's us
self.hbox.pack_start(self.image, False, False)
self.hbox.pack_start(self.table, True, True) self.hbox.pack_start(self.table, True, True)
self.hbox.pack_start(self.avatar_image, False, False) self.hbox.pack_start(self.avatar_image, False, False)
self.win.add(self.hbox) self.win.add(self.hbox)