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

[David Flatz] show transports even if show transports is false when they have unread events. Fixes #5591

Browse source
This commit is contained in:
Yann Leboulanger 2010-02-07 20:12:58 +01:00
parent 5372611e60
commit bfab8e3614
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/roster_window.py
View file

@ -1509,6 +1509,15 @@ class RosterWindow:
if type_ == 'group': if type_ == 'group':
group = jid group = jid
if group == _('Transports'): if group == _('Transports'):
if self.regroup:
accounts = gajim.contacts.get_accounts()
else:
accounts = [account]
for _acc in accounts:
for contact in gajim.contacts.iter_contacts(_acc):
if group in contact.get_shown_groups() and \
self.contact_has_pending_roster_events(contact, _acc):
return True
return gajim.config.get('show_transports_group') and \ return gajim.config.get('show_transports_group') and \
(gajim.account_is_connected(account) or \ (gajim.account_is_connected(account) or \
gajim.config.get('showoffline')) gajim.config.get('showoffline'))
@ -1555,9 +1564,12 @@ class RosterWindow:
jid) jid)
return self.contact_is_visible(contact, account) return self.contact_is_visible(contact, account)
if type_ == 'agent': if type_ == 'agent':
return gajim.config.get('show_transports_group') and \ contact = gajim.contacts.get_contact_with_highest_priority(account,
jid)
return self.contact_has_pending_roster_events(contact, account) or \
(gajim.config.get('show_transports_group') and \
(gajim.account_is_connected(account) or \ (gajim.account_is_connected(account) or \
gajim.config.get('showoffline')) gajim.config.get('showoffline')))
return True return True
def _compareIters(self, model, iter1, iter2, data=None): def _compareIters(self, model, iter1, iter2, data=None):