Author: steve-e Date: 2008-07-22 22:29:31 +0200 (Tue, 22 Jul 2008) New Revision: 9985

Modified: trunk/src/roster_window.py Log: 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

Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-22 20:06:50 UTC (rev 9984) +++ trunk/src/roster_window.py 2008-07-22 20:29:31 UTC (rev 9985) @@ -1260,9 +1260,6 @@ 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 @@ 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 @@ 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):