diff options
author | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-10-05 14:36:13 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-10-05 14:36:13 (GMT) |
commit | 4fb2943ec4564c5a007de993ab9ff13a8daa3e23 (patch) | |
tree | 35cd98ff2fc39477e91c298aae4e6240ae4f91d9 /src/sugar/presence | |
parent | 7dedaeb7bb68c852d60e2225ae205a2fbbbb2bbb (diff) |
Fix running multiple instances of Browse by adapting to API changes #2404
* sugar/presence/presenceservice.py: Specify the D-Bus interface when
calling ActivityProperties.GetActivity
* sugar/activity/main.py: Set a default for the --invite option and
make the create() D-Bus method accept a{sv} so we can pass the
boolean value.
Diffstat (limited to 'src/sugar/presence')
-rw-r--r-- | src/sugar/presence/presenceservice.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/sugar/presence/presenceservice.py b/src/sugar/presence/presenceservice.py index 862d6d0..51d8625 100644 --- a/src/sugar/presence/presenceservice.py +++ b/src/sugar/presence/presenceservice.py @@ -42,6 +42,8 @@ _logger = logging.getLogger('sugar.presence.presenceservice') ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager' ACCOUNT_MANAGER_PATH = '/org/freedesktop/Telepathy/AccountManager' +CONN_INTERFACE_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties' + class PresenceService(gobject.GObject): """Provides simplified access to the Telepathy framework to activities""" __gsignals__ = { @@ -80,7 +82,9 @@ class PresenceService(gobject.GObject): continue logging.debug("Calling GetActivity on %s", account_path) try: - room_handle = connection.connection.GetActivity(activity_id) + room_handle = connection.connection.GetActivity( + activity_id, + dbus_interface=CONN_INTERFACE_ACTIVITY_PROPERTIES) except dbus.exceptions.DBusException, e: name = 'org.freedesktop.Telepathy.Error.NotAvailable' if e.get_dbus_name() == name: |