From b5b9d9d5f1de6d9f62dceb8e7aa1c437048f9065 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 1 Dec 2006 22:33:00 +0100 Subject: [PATCH] Remove more old activities code --- shell/view/ActivityHost.py | 10 ++-------- shell/view/frame/ActivitiesBox.py | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/shell/view/ActivityHost.py b/shell/view/ActivityHost.py index ceeeeed7..65e2ac03 100644 --- a/shell/view/ActivityHost.py +++ b/shell/view/ActivityHost.py @@ -56,14 +56,8 @@ class ActivityHost: self._type = self._activity.get_type() self._gdk_window = gtk.gdk.window_foreign_new(self._xid) - # FIXME Old activity registry support, cleanup - registry = conf.get_activity_registry() - info = registry.get_activity(self._type) - - if not info: - registry = shell_model.get_bundle_registry() - info = registry.get_bundle(self._type) - + registry = shell_model.get_bundle_registry() + info = registry.get_bundle(self._type) self._icon_name = info.get_icon() try: diff --git a/shell/view/frame/ActivitiesBox.py b/shell/view/frame/ActivitiesBox.py index 02905243..81b26eeb 100644 --- a/shell/view/frame/ActivitiesBox.py +++ b/shell/view/frame/ActivitiesBox.py @@ -29,7 +29,7 @@ class ActivityItem(CanvasIcon): self._activity = activity def get_bundle_id(self): - return self._activity.get_id() + return self._activity.get_service_name() class InviteItem(CanvasIcon): def __init__(self, invite):