X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection_manager.py;h=92a12ae4ec67563d6fa0c92f7a12b787623749b6;hp=207f773f9d594cbc1358abb0b484cb884ac2ec70;hb=7f6c18e15e7a157208a9523a3d14f07c9a0b7f72;hpb=a840b976430685dbf23bee4e590d1ee23594728c

diff --git a/src/connection_manager.py b/src/connection_manager.py
index 207f773..92a12ae 100644
--- a/src/connection_manager.py
+++ b/src/connection_manager.py
@@ -1,11 +1,3 @@
-"""
-Empathy Experience:
-	Can't call
-	When first started, reports all read conversations when some might have been read
-	When first started, reports all of an SMS conversation even though some has been reported previously
-	Still leaking one of two contact lists
-"""
-
 import logging
 
 import gobject
@@ -14,6 +6,7 @@ import telepathy
 import constants
 import tp
 import gtk_toolbox
+import util.go_utils as gobject_utils
 import connection
 
 
@@ -45,34 +38,24 @@ class TheOneRingConnectionManager(tp.ConnectionManager):
 		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
@@ -82,7 +65,7 @@ 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):
 		"""