Implemented conversations with full testing, oh and got some addressbook stuff done

[theonering] / src / connection_manager.py

diff --git a/src/connection_manager.py b/src/connection_manager.py
index e10f520..f169789 100644 (file)
--- a/src/connection_manager.py
+++ b/src/connection_manager.py
@@ -15,6 +15,7 @@ class TheOneRingConnectionManager(telepathy.server.ConnectionManager):
        def __init__(self, shutdown_func=None):
                telepathy.server.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")
@@ -30,9 +31,9 @@ class TheOneRingConnectionManager(telepathy.server.ConnectionManager):
 
                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
 
                for parameterName, parameterType in mandatoryParameters.iteritems():
                        flags = telepathy.CONN_MGR_PARAM_FLAG_REQUIRED