Only show customstatus icon for contacts and reset on statuschange. Fixes #3381.
This commit is contained in:
parent
1b43c4f31e
commit
003fc8fd24
|
@ -1335,6 +1335,11 @@ class RosterWindow:
|
||||||
ctrl.print_conversation(_('%s is now %s') % (name, uf_show),
|
ctrl.print_conversation(_('%s is now %s') % (name, uf_show),
|
||||||
'status')
|
'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:
|
if not contact.groups:
|
||||||
self.draw_group(_('General'), account)
|
self.draw_group(_('General'), account)
|
||||||
else:
|
else:
|
||||||
|
@ -2652,10 +2657,6 @@ class RosterWindow:
|
||||||
if group in gajim.connections[account].blocked_groups:
|
if group in gajim.connections[account].blocked_groups:
|
||||||
send_custom_status_menuitem.set_image(self.load_icon('offline'))
|
send_custom_status_menuitem.set_image(self.load_icon('offline'))
|
||||||
send_custom_status_menuitem.set_sensitive(False)
|
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:
|
else:
|
||||||
icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK,
|
icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK,
|
||||||
gtk.ICON_SIZE_MENU)
|
gtk.ICON_SIZE_MENU)
|
||||||
|
|
Loading…
Reference in New Issue