Make adding/removing contacts symmetric.

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@151 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>

diff --git a/src/legacy/glue.py b/src/legacy/glue.py
index 0ba47b42685d96747e78353f707c0309b00e5061..866f3da69f6832deb92c404aa177f4fdf2832a50 100644 (file)
--- a/src/legacy/glue.py
+++ b/src/legacy/glue.py
@@ -560,6 +560,12 @@ class LegacyList:
                LogEvent(INFO, self.jabberID)
                userHandle = jid2msn(jid)
                self.session.legacycon.addContact(msn.FORWARD_LIST, userHandle)
+
+               # Handle adding a contact that has previously been removed
+               msnContact = self.session.legacycon.getContacts().getContact(userHandle)
+               self.session.legacycon.remContact(msn.BLOCK_LIST, jid)
+               if msnContact.lists & msn.REVERSE_LIST:
+                       self.session.legacycon.contactAddedMe(userHandle)
                self.session.contactList.getContact(jid).contactGrantsAuth()
        
        def removeContact(self, jid):