From 003fc8fd247500dff82618f64dfe54a283a95fe4 Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Tue, 21 Aug 2007 21:24:52 +0000 Subject: [PATCH] Only show customstatus icon for contacts and reset on statuschange. Fixes #3381. --- src/roster_window.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/roster_window.py b/src/roster_window.py index 2271152e7..ea26cd858 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1335,6 +1335,11 @@ class RosterWindow: ctrl.print_conversation(_('%s is now %s') % (name, uf_show), 'status') + # unset custom status + if gajim.interface.status_sent_to_users.has_key(account) and \ + contact.jid in gajim.interface.status_sent_to_users[account]: + del gajim.interface.status_sent_to_users[account][contact.jid] + if not contact.groups: self.draw_group(_('General'), account) else: @@ -2652,10 +2657,6 @@ class RosterWindow: if group in gajim.connections[account].blocked_groups: send_custom_status_menuitem.set_image(self.load_icon('offline')) send_custom_status_menuitem.set_sensitive(False) - elif gajim.interface.status_sent_to_groups.has_key(account) and \ - group in gajim.interface.status_sent_to_groups[account]: - send_custom_status_menuitem.set_image(self.load_icon( - gajim.interface.status_sent_to_groups[account][group])) else: icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_MENU)