Changed total users to total connections in stats.

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

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

diff --git a/src/lang.py b/src/lang.py
index fd31c11ed196ff4bb65182a7dc229008733ea7d6..4674cbe7451a4a911f4a66d179db159cf6889599 100644 (file)
--- a/src/lang.py
+++ b/src/lang.py
@@ -49,7 +49,7 @@ class strings:
                command_ConnectUsers = u"Connect all registered users"
                command_Statistics = u"Statistics for PyMSNt"
                command_OnlineUsers = u"Online Users"
                command_ConnectUsers = u"Connect all registered users"
                command_Statistics = u"Statistics for PyMSNt"
                command_OnlineUsers = u"Online Users"

-               command_TotalUsers = u"Total Users"
+               command_TotalUsers = u"Total Connections"

                command_Uptime = u"Uptime"
                command_MessageCount = u"Message Count"
                command_FailedMessageCount = u"Failed Message Count"
                command_Uptime = u"Uptime"
                command_MessageCount = u"Message Count"
                command_FailedMessageCount = u"Failed Message Count"


@@ -96,7 +96,7 @@ class strings:
                command_ConnectUsers = u"Connect all registered users"
                command_Statistics = u"Statistics for PyMSNt"
                command_OnlineUsers = u"Online Users"
                command_ConnectUsers = u"Connect all registered users"
                command_Statistics = u"Statistics for PyMSNt"
                command_OnlineUsers = u"Online Users"

-               command_TotalUsers = u"Total Users"
+               command_TotalUsers = u"Total Connections"

                command_Uptime = u"Uptime"
                command_MessageCount = u"Message Count"
                command_AvatarCount = u"Avatar Count"
                command_Uptime = u"Uptime"
                command_MessageCount = u"Message Count"
                command_AvatarCount = u"Avatar Count"


@@ -186,7 +186,7 @@ class strings:
                command_ConnectUsers = u"Connect all registered users"
                command_Statistics = u"Statistics for PyMSNt"
                command_OnlineUsers = u"Online Users"
                command_ConnectUsers = u"Connect all registered users"
                command_Statistics = u"Statistics for PyMSNt"
                command_OnlineUsers = u"Online Users"

-               command_TotalUsers = u"Total Users"
+               command_TotalUsers = u"Total Connections"

                command_Uptime = u"Uptime"
                command_MessageCount = u"Message Count"
                command_AvatarCount = u"Avatar Count"
                command_Uptime = u"Uptime"
                command_MessageCount = u"Message Count"
                command_AvatarCount = u"Avatar Count"


@@ -279,7 +279,7 @@ class strings:
                command_ConnectUsers = u"Connect all registered users"
                command_Statistics = u"Statistics for PyMSNt"
                command_OnlineUsers = u"Online Users"
                command_ConnectUsers = u"Connect all registered users"
                command_Statistics = u"Statistics for PyMSNt"
                command_OnlineUsers = u"Online Users"

-               command_TotalUsers = u"Total Users"
+               command_TotalUsers = u"Total Connections"

                command_Uptime = u"Uptime"
                command_MessageCount = u"Message Count"
                command_AvatarCount = u"Avatar Count"
                command_Uptime = u"Uptime"
                command_MessageCount = u"Message Count"
                command_AvatarCount = u"Avatar Count"

diff --git a/src/legacy/glue.py b/src/legacy/glue.py
index c00be73b341226805a33fa4659c545b5973e24f3..9158dbe770620b7454523b815f0ba000dac84b1c 100644 (file)
--- a/src/legacy/glue.py
+++ b/src/legacy/glue.py
@@ -551,10 +551,8 @@ class LegacyList:
        def __init__(self, session):
                self.jabberID = session.jabberID
                self.session = session
        def __init__(self, session):
                self.jabberID = session.jabberID
                self.session = session

-               self.subscriptionBuffer = []

        
        def removeMe(self):
        
        def removeMe(self):

-               self.subscriptionBuffer = None

                self.session = None
 
        def addContact(self, jid):
                self.session = None
 
        def addContact(self, jid):

diff --git a/src/tlib/msn/msnw.py b/src/tlib/msn/msnw.py
index 368bdfeed3c37a08740aa702682df8be40121718..46d8018d3c059e5eb4a2f37a04f5df12554ae931 100644 (file)
--- a/src/tlib/msn/msnw.py
+++ b/src/tlib/msn/msnw.py
@@ -51,6 +51,7 @@ class MSNConnection:
        def _getNotificationReferral(self):
                def timeout():
                        self.timeout = None
        def _getNotificationReferral(self):
                def timeout():
                        self.timeout = None

+                       dispatchFactory.d = None

                        if not d.called:
                                d.errback(Exception("Timeout"))
                                self.logOut() # Clean up everything
                        if not d.called:
                                d.errback(Exception("Timeout"))
                                self.logOut() # Clean up everything


@@ -358,8 +359,11 @@ class SavedEvents:
 
 class DispatchClient(msn.DispatchClient):
        def gotNotificationReferral(self, host, port):
 
 class DispatchClient(msn.DispatchClient):
        def gotNotificationReferral(self, host, port):

-               if self.factory.d.called: return # Too slow! We've already timed out
-               self.factory.d.callback((host, port))
+               d = self.factory.d
+               self.factory.d = None
+               if not d or d.called:
+                       return # Too slow! We've already timed out
+               d.callback((host, port))

 
 
 class NotificationClient(msn.NotificationClient):
 
 
 class NotificationClient(msn.NotificationClient):