From 9ecf0e5fa96b32fdc5f5c439f7472f35c1009af7 Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Tue, 22 Jul 2008 20:29:31 +0000 Subject: [PATCH] Some small tweaks to the roster visible_func * Do not show transports when the account is disconnected. Fixes #4124 * Hide contacts with unconfirmed subscription when we only want to see online contacts. Fixes #4118 --- src/roster_window.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/roster_window.py b/src/roster_window.py index b5383df63..89e982e05 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1260,9 +1260,6 @@ class RosterWindow: if self.contact_has_pending_roster_events(contact, account): return True - if contact.ask: - return True - if contact.show in ('offline', 'error'): if contact.jid in gajim.to_be_removed[account]: return True @@ -1290,10 +1287,13 @@ class RosterWindow: if type_ == 'group': group = jid if group == _('Transports'): - return gajim.config.get('show_transports_group') + return gajim.config.get('show_transports_group') and \ + (gajim.account_is_connected(account) or \ + gajim.config.get('showoffline')) if gajim.config.get('showoffline'): return True + if self.regroup: # C_ACCOUNT for groups depends on the order # accounts were connected @@ -1331,7 +1331,9 @@ class RosterWindow: contact = gajim.contacts.get_first_contact_from_jid(account, jid) return self.contact_is_visible(contact, account) if type_ == 'agent': - return gajim.config.get('show_transports_group') + return gajim.config.get('show_transports_group') and \ + (gajim.account_is_connected(account) or \ + gajim.config.get('showoffline')) return True def _compareIters(self, model, iter1, iter2, data = None):