From: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>
Date: Sun, 2 Jul 2006 14:29:06 +0000 (+0000)
Subject: Changed total users to total connections in stats.
X-Git-Url: https://code.delx.au/pymsnt/commitdiff_plain/f3c0541ec9baf3be95cd24b54f2844f1e1b51d93

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 fd31c11..4674cbe 100644
--- 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_TotalUsers = u"Total Users"
+		command_TotalUsers = u"Total Connections"
 		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_TotalUsers = u"Total Users"
+		command_TotalUsers = u"Total Connections"
 		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_TotalUsers = u"Total Users"
+		command_TotalUsers = u"Total Connections"
 		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_TotalUsers = u"Total Users"
+		command_TotalUsers = u"Total Connections"
 		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 c00be73..9158dbe 100644
--- 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
-		self.subscriptionBuffer = []
 	
 	def removeMe(self):
-		self.subscriptionBuffer = None
 		self.session = None
 
 	def addContact(self, jid):
diff --git a/src/tlib/msn/msnw.py b/src/tlib/msn/msnw.py
index 368bdfe..46d8018 100644
--- 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
+			dispatchFactory.d = None
 			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):
-		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):