diff options
author | Dan Williams <dcbw@redhat.com> | 2007-04-26 02:39:39 (GMT) |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2007-04-26 02:39:39 (GMT) |
commit | 9446c951acfe1c96e10bdec88c0f8a5f8d8b77ce (patch) | |
tree | 1c68321e4f7494b18351f238cf61e1afc6a56ce7 /shell | |
parent | 4b177d329d95c5dc839d10cab16dc8412456831d (diff) | |
parent | 78cdbbcb09d40cb4d67bcbad1097ba8482b236b6 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'shell')
-rw-r--r-- | shell/model/MeshModel.py | 2 | ||||
-rw-r--r-- | shell/view/frame/FriendsBox.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shell/model/MeshModel.py b/shell/model/MeshModel.py index b037bb7..db6d8a9 100644 --- a/shell/model/MeshModel.py +++ b/shell/model/MeshModel.py @@ -193,7 +193,7 @@ class MeshModel(gobject.GObject): self._check_activity(activity) def _check_activity(self, activity): - atype = activity.get_type() + atype = activity.props.type bundle = self._bundle_registry.get_bundle(atype) if not bundle: return diff --git a/shell/view/frame/FriendsBox.py b/shell/view/frame/FriendsBox.py index e5b49d1..b998c51 100644 --- a/shell/view/frame/FriendsBox.py +++ b/shell/view/frame/FriendsBox.py @@ -81,7 +81,7 @@ class FriendsBox(hippo.CanvasBox): def __activity_appeared_cb(self, pservice, activity_ps): activity = self._shell.get_current_activity() - if activity and activity_ps.get_id() == activity.get_id(): + if activity and activity_ps.props.id == activity.get_id(): self._set_activity_ps(activity_ps) def _set_activity_ps(self, activity_ps): |