Changeset 9429

Timestamp:

04/02/08 01:13:10 (8 months ago)

Author:

asterix

Message:

don't remove metacontact when we reconnect. fixes #3771

Location:

trunk/src

Files:

• common/contacts.py (modified) (2 diffs)
• roster_window.py (modified) (1 diff)

trunk/src/common/contacts.py

@@ -217 +217 @@
                 self._contacts[account] = {}
 
-        def remove_jid(self, account, jid):
+        def remove_jid(self, account, jid, remove_meta=True):
                 '''Removes all contacts for a given jid'''
                 if not self._contacts.has_key(account):
@@ -224 +224 @@
                         return
                 del self._contacts[account][jid]
-                # remove metacontacts info
-                self.remove_metacontact(account, jid)
+                if remove_meta:
+                        # remove metacontacts info
+                        self.remove_metacontact(account, jid)
 
         def get_contacts(self, account, jid):

trunk/src/roster_window.py

@@ -1295 +1295 @@
                 for jid in array.keys():
                         # Remove old Contact instances
-                        gajim.contacts.remove_jid(account, jid)
+                        gajim.contacts.remove_jid(account, jid, remove_meta=False)
                         jids = jid.split('/')
                         # get jid