X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection_manager.py;h=d21c8a7e93ff09bb38faf79f21af1424768cc5a7;hp=e10f5204971c6ba0b09db850e03ae6660d507935;hb=472d5669384d85ddc85aff8050fbb6150b47152e;hpb=7912b2aa8daf492f3933d975fab97e59937981e1

diff --git a/src/connection_manager.py b/src/connection_manager.py
index e10f520..d21c8a7 100644
--- a/src/connection_manager.py
+++ b/src/connection_manager.py
@@ -1,24 +1,28 @@
 import logging
 
-import gobject
 import telepathy
 
 import constants
+import tp
+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(telepathy.server.ConnectionManager):
+class TheOneRingConnectionManager(tp.ConnectionManager):
 
 	def __init__(self, shutdown_func=None):
-		telepathy.server.ConnectionManager.__init__(self, constants._telepathy_implementation_name_)
+		tp.ConnectionManager.__init__(self, constants._telepathy_implementation_name_)
 
+		# self._protos is from super
 		self._protos[constants._telepathy_protocol_name_] = connection.TheOneRingConnection
 		self._on_shutdown = shutdown_func
 		_moduleLogger.info("Connection manager created")
 
+	@misc_utils.log_exception(_moduleLogger)
 	def GetParameters(self, proto):
 		"""
 		For org.freedesktop.telepathy.ConnectionManager
@@ -26,60 +30,51 @@ class TheOneRingConnectionManager(telepathy.server.ConnectionManager):
 		@returns the mandatory and optional parameters for creating a connection
 		"""
 		if proto not in self._protos:
-			raise telepathy.NotImplemented('unknown protocol %s' % proto)
+			raise telepathy.errors.NotImplemented('unknown protocol %s' % proto)
 
 		result = []
 		ConnectionClass = self._protos[proto]
-		mandatoryParameters = ConnectionClass.MANDATORY_PARAMETERS
-		optionalParameters = ConnectionClass.OPTIONAL_PARAMETERS
-		defaultParameters = ConnectionClass.PARAMETER_DEFAULTS
+		mandatoryParameters = ConnectionClass._mandatory_parameters
+		optionalParameters = ConnectionClass._optional_parameters
+		defaultParameters = ConnectionClass._parameter_defaults
+		secretParameters = ConnectionClass._secret_parameters
 
 		for parameterName, parameterType in mandatoryParameters.iteritems():
 			flags = telepathy.CONN_MGR_PARAM_FLAG_REQUIRED
-			if parameterName == "password":
+			if parameterName in secretParameters:
 				flags |= telepathy.CONN_MGR_PARAM_FLAG_SECRET
-			param = (
-				parameterName,
-				flags,
-				parameterType,
-				'',
-			)
+			param = (parameterName, flags, parameterType, "")
 			result.append(param)
 
 		for parameterName, parameterType in optionalParameters.iteritems():
+			flags = 0
+			default = ""
+			if parameterName in secretParameters:
+				flags |= telepathy.CONN_MGR_PARAM_FLAG_SECRET
 			if parameterName in defaultParameters:
-				flags = telepathy.CONN_MGR_PARAM_FLAG_HAS_DEFAULT
-				if parameterName == "password":
-					flags |= telepathy.CONN_MGR_PARAM_FLAG_SECRET
+				flags |= telepathy.CONN_MGR_PARAM_FLAG_HAS_DEFAULT
 				default = defaultParameters[parameterName]
-			else:
-				flags = 0
-				default = ""
-			param = (
-				parameterName,
-				flags,
-				parameterName,
-				default,
-			)
+			param = (parameterName, flags, parameterType, default)
 			result.append(param)
 
 		return result
 
 	def disconnected(self, conn):
 		"""
-		Overrides telepathy.server.ConnectionManager
+		Overrides tp.ConnectionManager
 		"""
-		result = telepathy.server.ConnectionManager.disconnected(self, conn)
-		gobject.timeout_add(5000, self.shutdown)
+		result = tp.ConnectionManager.disconnected(self, conn)
+		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")
 
+	@misc_utils.log_exception(_moduleLogger)
 	def _shutdown(self):
 		if (
 			self._on_shutdown is not None and