X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconnection_manager.py;h=b9a8e3777452a2e8893872112cd46cbdf5d4b764;hb=21409ee55813e0c4c3af7eaa581789317a30dece;hp=64b6bf8ae3a1c309398563693a452bad6a4070cf;hpb=1c892d1b9bf14b28eb54ce3590ed2ee29d5e3d25;p=theonering

diff --git a/src/connection_manager.py b/src/connection_manager.py
index 64b6bf8..b9a8e37 100644
--- a/src/connection_manager.py
+++ b/src/connection_manager.py
@@ -9,11 +9,13 @@ import util.misc as misc_utils
 import connection
 
 
-_moduleLogger = logging.getLogger("connection_manager")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class TheOneRingConnectionManager(tp.ConnectionManager):
 
+	IDLE_TIMEOUT = 10
+
 	def __init__(self, shutdown_func=None):
 		tp.ConnectionManager.__init__(self, constants._telepathy_implementation_name_)
 
@@ -59,19 +61,15 @@ class TheOneRingConnectionManager(tp.ConnectionManager):
 
 		return result
 
-	def disconnected(self, conn):
-		"""
-		Overrides tp.ConnectionManager
-		"""
-		result = tp.ConnectionManager.disconnected(self, conn)
-		gobject_utils.timeout_add_seconds(5, self._shutdown)
+	def disconnect_completed(self):
+		gobject_utils.timeout_add_seconds(self.IDLE_TIMEOUT, self._shutdown)
 
 	def quit(self):
 		"""
 		Terminates all connections. Must be called upon quit
 		"""
-		for connection in self._connections:
-			connection.Disconnect()
+		for conn in self._connections:
+			conn.Disconnect()
 		_moduleLogger.info("Connection manager quitting")
 
 	@misc_utils.log_exception(_moduleLogger)