-"""
-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
import constants
import tp
import gtk_toolbox
+import util.go_utils as gobject_utils
import connection
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
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):
"""