Changeset 9985

Timestamp:

07/22/08 22:29:31 (4 months ago)

Author:

steve-e

Message:

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

Files:

• trunk/src/roster_window.py (modified) (3 diffs)

trunk/src/roster_window.py

@@ -1261 +1261 @@
                         return True
 
-                if contact.ask:
-                        return True
-
                 if contact.show in ('offline', 'error'):
                         if contact.jid in gajim.to_be_removed[account]:
@@ -1291 +1288 @@
                         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:
@@ -1332 +1332 @@
                                 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