X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconnection_manager.py;h=d21c8a7e93ff09bb38faf79f21af1424768cc5a7;hb=472d5669384d85ddc85aff8050fbb6150b47152e;hp=90252b622a4fe36f29e3606869603daa03f8280d;hpb=092d3d1486f3af0fa58d94f9b13d5073964615ca;p=theonering

diff --git a/src/connection_manager.py b/src/connection_manager.py
index 90252b6..d21c8a7 100644
--- a/src/connection_manager.py
+++ b/src/connection_manager.py
@@ -1,19 +1,18 @@
 import logging
 
-import gobject
 import telepathy
 
 import constants
 import tp
-import gtk_toolbox
+import util.go_utils as gobject_utils
+import util.misc as misc_utils
 import connection
 
 
-_moduleLogger = logging.getLogger("connection_manager")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class TheOneRingConnectionManager(tp.ConnectionManager):
-	# @bug Crashing Maemo 4.1's RTComm on occasion
 
 	def __init__(self, shutdown_func=None):
 		tp.ConnectionManager.__init__(self, constants._telepathy_implementation_name_)
@@ -23,7 +22,7 @@ class TheOneRingConnectionManager(tp.ConnectionManager):
 		self._on_shutdown = shutdown_func
 		_moduleLogger.info("Connection manager created")
 
-	@gtk_toolbox.log_exception(_moduleLogger)
+	@misc_utils.log_exception(_moduleLogger)
 	def GetParameters(self, proto):
 		"""
 		For org.freedesktop.telepathy.ConnectionManager
@@ -65,17 +64,17 @@ class TheOneRingConnectionManager(tp.ConnectionManager):
 		Overrides tp.ConnectionManager
 		"""
 		result = tp.ConnectionManager.disconnected(self, conn)
-		gobject.timeout_add(5000, self._shutdown)
+		gobject_utils.timeout_add_seconds(5, 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")
 
-	@gtk_toolbox.log_exception(_moduleLogger)
+	@misc_utils.log_exception(_moduleLogger)
 	def _shutdown(self):
 		if (
 			self._on_shutdown is not None and