Changeset 9770

Timestamp:

06/08/08 16:35:40 (6 months ago)

Author:

jim++

Message:

Don't act like if self contact is in group General. See #4000.
Don't make General group visible when we have self contact.

Files:

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

trunk/src/roster_window.py

@@ -954 +954 @@
                 if contact.is_observer():
                         groups = [_('Observers')]
-                elif not groups:
+                elif not groups and \
+                not contact.jid == gajim.get_jid_from_account(account):
+                        # no group, and not self contact
                         groups = [_('General')]
 
@@ -1376 +1378 @@
                         for _acc in accounts:
                                 for contact in gajim.contacts.iter_contacts(_acc):
-                                        # Is this contact in this group ?
+                                        # Is this contact in this group ? (last part of if check if it's 
+                                        # self contact) 
                                         if group in contact.groups or (group == _('General') and not \
-                                        contact.groups):
+                                        contact.groups and \
+                                        not contact.jid == gajim.get_jid_from_account(account)):
                                                 if self.contact_is_visible(contact, _acc):
                                                         return True