Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/sugar/presence/activity.py
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2008-07-14 16:42:58 (GMT)
committer Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>2008-07-14 16:42:58 (GMT)
commit6a78863c220f7bcdd510a06b21ef03aaad5eb2b1 (patch)
tree67c95e61db288172d599d93c2c8994508b1a7e3f /src/sugar/presence/activity.py
parent5c40a70e5eea682c6194b89b27768700c1a98e32 (diff)
parent6a41396dd2ee5ca66d6cb64a3f592892f6f60492 (diff)
Merge branch 'master' of git+ssh://guillaume@dev.laptop.org/git/sugar-toolkit into 5079-rebased
Diffstat (limited to 'src/sugar/presence/activity.py')
-rw-r--r--src/sugar/presence/activity.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/sugar/presence/activity.py b/src/sugar/presence/activity.py
index b6351a8..ab3cfff 100644
--- a/src/sugar/presence/activity.py
+++ b/src/sugar/presence/activity.py
@@ -235,12 +235,18 @@ class Activity(gobject.GObject):
def get_joined_buddies(self):
"""Retrieve the set of Buddy objects attached to this activity
- returns list of presence Buddy objects
+ returns list of presence Buddy objects that we can successfully
+ create from the buddy object paths that PS has for this activity.
"""
resp = self._activity.GetJoinedBuddies()
buddies = []
for item in resp:
- buddies.append(self._ps_new_object(item))
+ try:
+ buddies.append(self._ps_new_object(item))
+ except dbus.DBusException:
+ _logger.debug(
+ 'get_joined_buddies failed to get buddy object for %r',
+ item)
return buddies
def get_buddy_by_handle(self, handle):