From 877b5516f611af10ac21f2bc314cfea275940629 Mon Sep 17 00:00:00 2001 From: jamesbunton Date: Tue, 23 May 2006 11:57:54 +0000 Subject: [PATCH] Hopefully fixed adding/removing contacts. git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@159 55fbd22a-6204-0410-b2f0-b6c764c7e90a committer: jamesbunton --- src/legacy/glue.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/legacy/glue.py b/src/legacy/glue.py index 866f3da..c72cb74 100644 --- a/src/legacy/glue.py +++ b/src/legacy/glue.py @@ -563,9 +563,9 @@ class LegacyList: # 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.authContact(jid) self.session.contactList.getContact(jid).contactGrantsAuth() def removeContact(self, jid): @@ -576,12 +576,12 @@ class LegacyList: def authContact(self, jid): LogEvent(INFO, self.jabberID) - jid = jid2msn(jid) - d = self.session.legacycon.remContact(msn.PENDING_LIST, jid) + userHandle = jid2msn(jid) + d = self.session.legacycon.remContact(msn.PENDING_LIST, userHandle) if d: - self.session.legacycon.addContact(msn.REVERSE_LIST, jid) - self.session.legacycon.remContact(msn.BLOCK_LIST, jid) - self.session.legacycon.addContact(msn.ALLOW_LIST, jid) + self.session.legacycon.addContact(msn.REVERSE_LIST, userHandle) + self.session.legacycon.remContact(msn.BLOCK_LIST, userHandle) + self.session.legacycon.addContact(msn.ALLOW_LIST, userHandle) def deauthContact(self, jid): LogEvent(INFO, self.jabberID) -- 2.39.2