Lots of work in prep for conversations to work

[theonering] / src / connection_manager.py

diff --git a/src/connection_manager.py b/src/connection_manager.py
index e10f520..16cfaf5 100644 (file)
--- a/src/connection_manager.py
+++ b/src/connection_manager.py
@@ -4,6 +4,7 @@ import gobject
 import telepathy
 
 import constants
+import gtk_toolbox
 import connection
 
 
@@ -15,10 +16,12 @@ 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")
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def GetParameters(self, proto):
                """
                For org.freedesktop.telepathy.ConnectionManager
@@ -26,13 +29,13 @@ 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
 
                for parameterName, parameterType in mandatoryParameters.iteritems():
                        flags = telepathy.CONN_MGR_PARAM_FLAG_REQUIRED