Disconnect switchboard sessions upon logout

[pymsnt] / src / legacy / msn / msnw.py

diff --git a/src/legacy/msn/msnw.py b/src/legacy/msn/msnw.py
index e88969042cd72092fe21c753c0ce7bd33c809144..713c5e9131ae8da93a7cf07646efcaa8f22f8759 100644 (file)
--- a/src/legacy/msn/msnw.py
+++ b/src/legacy/msn/msnw.py
@@ -169,16 +169,16 @@ class MSNConnection:
                sb = self.switchboardSessions.get(userHandle)
                if sb: return sb.sendTypingNotification()
        
-       def changeAvatar(self, imageData):
+       def changeAvatar(self, imageDataFunc):
                """
                Changes the user's avatar.
-               @param imageData: the new PNG avatar image data.
+               @param imageDataFunc: a function which returns the new PNG avatar image data.
                """
                if self.notificationClient:
                        LogEvent(INFO, self.ident)
-                       self.notificationClient.changeAvatar(imageData, push=True)
+                       self.notificationClient.changeAvatar(imageDataFunc, push=True)
                # Save the avatar for reuse on disconnection
-               self.savedEvents.avatarImageData = imageData
+               self.savedEvents.avatarImageDataFunc = imageDataFunc
        
        def changeStatus(self, statusCode, screenName, personal):
                """
@@ -342,13 +342,13 @@ class SavedEvents:
                self.screenName = ""
                self.statusCode = ""
                self.personal = ""
-               self.avatarImageData = ""
+               self.avatarImageDataFunc = None
                self.addContacts = []
                self.remContacts = []
        
        def send(self, msncon):
-               if self.avatarImageData:
-                       msncon.notificationClient.changeAvatar(self.avatarImageData, push=False)
+               if self.avatarImageDataFunc:
+                       msncon.notificationClient.changeAvatar(self.avatarImageDataFunc, push=False)
                if self.screenName or self.statusCode or self.personal:
                        msncon.changeStatus(self.statusCode, self.screenName, self.personal)
                for listType, userHandle in self.addContacts:
@@ -502,7 +502,7 @@ class SwitchboardSessionBase(msn.SwitchboardClient):
                        self.reply = 0
                        factory = ClientFactory()
                        factory.buildProtocol = lambda addr: self
-                       reactor.connectTCP(host, port, factory)
+                       self.msncon.connectors.append(reactor.connectTCP(host, port, factory))
                def sbRequestFailed(ignored=None):
                        LogEvent(INFO, self.ident)
                        del self.msncon.switchboardSessions[self.remoteUser]
@@ -517,7 +517,7 @@ class SwitchboardSessionBase(msn.SwitchboardClient):
                self.reply = 1
                factory = ClientFactory()
                factory.buildProtocol = lambda addr: self
-               reactor.connectTCP(host, port, factory)
+               self.msncon.connectors.append(reactor.connectTCP(host, port, factory))
        
        def flushBuffer(self):
                for message, noerror in self.messageBuffer[:]: