Merge branch 'master' of https://github.com/tgalal/yowsup

src/Yowsup/connectionmanager.py

@@ -673,7 +673,7 @@ def __init__(self):
 		#self.socket = connection
 		self.terminateRequested = False
 		self.disconnectedSent = False
-		self.timeout = 240
+		self.timeout = 180
 		self.selectTimeout = 3
 		self.requests = {};
 		self.lock = threading.Lock()
@@ -724,7 +724,7 @@ def run(self):
 				if countdown % (self.selectTimeout*10) == 0 or countdown < 11:
 					self._d("Waiting, time to die: T-%i seconds" % countdown )
 
-				if self.timeout-countdown == 210 and self.ping and self.autoPong:
+				if self.timeout-countdown == 150 and self.ping and self.autoPong:
 					self.ping()
 
 				self.selectTimeout = 1 if countdown < 11 else 3