From d58936869f3223624d08ec5530bc3bc51b24e29c Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 8 Sep 2006 01:54:52 +0200 Subject: [PATCH] Bugfixes --- shell/frame/RightPanel.py | 5 +++-- shell/home/MeshGroup.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/shell/frame/RightPanel.py b/shell/frame/RightPanel.py index c43933ab..d999660e 100644 --- a/shell/frame/RightPanel.py +++ b/shell/frame/RightPanel.py @@ -4,6 +4,7 @@ from frame.PanelWindow import PanelWindow from sugar.canvas.IconItem import IconItem from sugar.canvas.IconColor import IconColor from sugar.canvas.GridLayout import GridGroup +from sugar.canvas.GridLayout import GridConstraints from sugar.presence import PresenceService class RightPanel(GridGroup): @@ -28,9 +29,9 @@ class RightPanel(GridGroup): constraints = GridConstraints(0, self.get_n_children() + 2, 1, 1) constraints.padding = 6 - self._layout.set_constraints(item, constraints) + self._layout.set_constraints(icon, constraints) - self.add_child(icon, i) + self.add_child(icon) def remove(self, buddy): pass diff --git a/shell/home/MeshGroup.py b/shell/home/MeshGroup.py index 5fdb9429..e2fd215d 100644 --- a/shell/home/MeshGroup.py +++ b/shell/home/MeshGroup.py @@ -82,7 +82,7 @@ class MeshGroup(goocanvas.Group): default_type = item.get_service().get_type() registry = conf.get_activity_registry() - bundle_id = registry.get_activity_from_type().get_id() - activity_id = service.get_activity_id() + bundle_id = registry.get_activity_from_type(default_type).get_id() + activity_id = item.get_service().get_activity_id() self._shell.join_activity(bundle_id, activity_id)