summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-01-24 17:27:15 +0000
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-04-04 17:58:18 +0100
commit0b9fcf07979843662e48c8000d9bcbb2fd1b10d3 (patch)
tree5b8e5bcb17f35a7549dbbc704c60c9bebb21885b
parente1d38d20b3bd573e107bae3bed50fa8a42b6940e (diff)
Make it possible to add a bus to the ManagerRegistry
-rw-r--r--src/client/managerregistry.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/client/managerregistry.py b/src/client/managerregistry.py
index d8d3931..6b178a5 100644
--- a/src/client/managerregistry.py
+++ b/src/client/managerregistry.py
@@ -42,8 +42,9 @@ def _convert_pathlist(pathlist):
return dirs
class ManagerRegistry:
- def __init__(self):
+ def __init__(self, bus=None):
self.services = {}
+ self.bus = bus
def LoadManager(self, path):
config = ConfigParser.RawConfigParser()
@@ -132,7 +133,8 @@ class ManagerRegistry:
def GetManager(self, manager):
return telepathy.client.ConnectionManager(
self.services[manager]['busname'],
- self.services[manager]['objectpath'])
+ self.services[manager]['objectpath'],
+ bus = self.bus)
def GetParams(self, manager, proto):
"""