diff options
author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-01-24 17:27:38 +0000 |
---|---|---|
committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-04-04 17:58:18 +0100 |
commit | a1b87337d8f2bacdb029f94c972b7413630da895 (patch) | |
tree | 1bce36c9df5ba583a7cbc03c126763986546d4d3 | |
parent | 0b9fcf07979843662e48c8000d9bcbb2fd1b10d3 (diff) |
pass an optional bus to the account to connect to
-rw-r--r-- | examples/account.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/examples/account.py b/examples/account.py index bd5d74a..0bca3da 100644 --- a/examples/account.py +++ b/examples/account.py @@ -40,17 +40,18 @@ def parse_account(s): def read_account(path): return parse_account(file(path).read()) -def connect(manager, protocol, account, ready_handler=None): - reg = telepathy.client.ManagerRegistry() +def connect(manager, protocol, account, ready_handler=None, bus=None): + reg = telepathy.client.ManagerRegistry(bus=bus) reg.LoadManagers() mgr = reg.GetManager(manager) conn_bus_name, conn_object_path = \ mgr[CONN_MGR_INTERFACE].RequestConnection(protocol, account) return telepathy.client.Connection(conn_bus_name, conn_object_path, - ready_handler=ready_handler) + ready_handler=ready_handler, bus=bus) -def connection_from_file(path, ready_handler=None): +def connection_from_file(path, ready_handler=None, bus=None): manager, protocol, account = read_account(path) - return connect(manager, protocol, account, ready_handler=ready_handler) + return connect(manager, protocol, account, + ready_handler=ready_handler, bus=bus) |