Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2006-10-20 17:15:30 (GMT)
committer Dan Williams <dcbw@redhat.com>2006-10-20 17:15:30 (GMT)
commitc15e05ed39cc0f1ac060ee25c25f0f04d09ec646 (patch)
tree8d559b10c97fa843912107a366020188e6a7fcae
parent1226b0b6b957f70b7885535b1f0213ed7072dc9a (diff)
parentae34c6d5fea226729553e8b266c4b2e76fc7f2c6 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
-rw-r--r--shell/model/MeshModel.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/model/MeshModel.py b/shell/model/MeshModel.py
index 9cb728c..c2eb167 100644
--- a/shell/model/MeshModel.py
+++ b/shell/model/MeshModel.py
@@ -80,10 +80,10 @@ class MeshModel(gobject.GObject):
self._check_service(service)
def get_activities(self):
- return self._activities
+ return self._activities.values()
def get_buddies(self):
- return self._buddies
+ return self._buddies.values()
def _buddy_activity_changed_cb(self, buddy, cur_activity):
if not self._buddies.has_key(buddy.get_name()):