Changeset 9894

Timestamp:

07/07/08 00:24:58 (2 months ago)

Author:

steve-e

Message:

Correctly readd a metacontact family after removing a single brother.

* Coding standards
* remove useless key-list creation

Location:

trunk/src

Files:

• gajim.py (modified) (2 diffs)
• roster_window.py (modified) (11 diffs)

trunk/src/gajim.py

@@ -927 +927 @@
                                         # This way we'll really remove it
                                         gajim.to_be_removed[account].remove(c.jid)
-                                self.roster.remove_contact(c.jid, account, backend = True)
+                                self.roster.remove_contact(c.jid, account, backend=True)
 
         def handle_event_register_agent_info(self, account, array):
@@ -1395 +1395 @@
                         # contact removes us.
                         if contacts:
-                                self.roster.remove_contact(jid, account, backend = True)
+                                self.roster.remove_contact(jid, account, backend=True)
                                 return
                 elif not contacts:

trunk/src/roster_window.py

@@ -668 +668 @@
 
 
-        def remove_contact(self, jid, account, force = False, backend = False):
+        def remove_contact(self, jid, account, force=False, backend=False):
                 '''Remove contact from roster.
 
@@ -693 +693 @@
                         # Contact has pending events
                         key = (jid, account)
-                        if not key in self.contacts_to_be_removed.keys():
+                        if not key in self.contacts_to_be_removed:
                                 self.contacts_to_be_removed[key] = {'backend': backend}
                         return False
@@ -706 +706 @@
                                 self._remove_entity(contact, account)
 
-                        # Draw all groups of the contact
 
                         if backend:
                                 # Remove contact before redrawing, otherwise the old
                                 # numbers will still be show
-                                gajim.contacts.remove_jid(account, jid)
-
+                                gajim.contacts.remove_jid(account, jid, remove_meta=True)
+                                family = gajim.contacts.get_metacontacts_family(account, jid)
+                                if family:
+                                        # reshow the rest of the family
+                                        self._add_metacontact_family(family, account)
+
+                        # Draw all groups of the contact
                         for group in contact.get_shown_groups():
                                 self.draw_group(group, account)
@@ -746 +750 @@
                 contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
                 if contact.is_groupchat():
-                        self.remove_contact(jid, account, force = True, backend = True)
+                        self.remove_contact(jid, account, force=True, backend=True)
                         return True
                 else:
@@ -768 +772 @@
                 '''Remove transport from roster and redraw account and group.'''
                 contact = gajim.contacts.get_contact_with_highest_priority(account, jid)
-                self.remove_contact(jid, account, force = True, backend = True)
+                self.remove_contact(jid, account, force=True, backend=True)
                 return True
 
@@ -1604 +1608 @@
                                 del self.contacts_to_be_removed[key]
                                 # Remove contact will delay removal if there are more events pending
-                                self.remove_contact(jid, account, backend = True)
+                                self.remove_contact(jid, account, backend=True)
                 self.show_title()
 
@@ -1818 +1822 @@
                 show in ('offline', 'error'):
                         # SelfContact went offline. Remove him when last pending message was read
-                        self.remove_contact(contact.jid, account, backend = True)
+                        self.remove_contact(contact.jid, account, backend=True)
 
                 # print status in chat window and update status/GPG image
@@ -2274 +2278 @@
                                 # remove it from treeview
                                 gajim.connections[account].unsubscribe(contact.jid)
-                                self.remove_contact(contact.jid, account, backend = True)
+                                self.remove_contact(contact.jid, account, backend=True)
                                 return
 
@@ -2282 +2286 @@
                                 gajim.connections[account].unsubscribe_agent(full_jid)
                                 # remove transport from treeview
-                                self.remove_contact(contact.jid, account, backend = True)
+                                self.remove_contact(contact.jid, account, backend=True)
 
                 # Check if there are unread events from some contacts
@@ -2545 +2549 @@
                                 else:
                                         gajim.connections[account].unsubscribe(contact.jid)
-                                        self.remove_contact(contact.jid, account, backend = True)
+                                        self.remove_contact(contact.jid, account, backend=True)
 
         def on_assign_pgp_key(self, widget, contact, account):
@@ -2919 +2923 @@
                         for (contact, account) in list_:
                                 gajim.connections[account].unsubscribe(contact.jid, remove_auth)
-                                self.remove_contact(contact.jid, account, backend = True)
+                                self.remove_contact(contact.jid, account, backend=True)
                                 if not remove_auth and contact.sub == 'both':
                                         contact.name = ''