sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use bundle registry correctly

Browse Source
This commit is contained in:
Dan Williams 2007-05-02 22:21:15 -04:00
parent 3502c58c47
commit 65998a10c6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/view/Shell.py
View File

@ -24,7 +24,7 @@ from view.home.HomeWindow import HomeWindow
from sugar.activity.activityhandle import ActivityHandle from sugar.activity.activityhandle import ActivityHandle
from sugar.graphics.popupcontext import PopupContext from sugar.graphics.popupcontext import PopupContext
from view.ActivityHost import ActivityHost from view.ActivityHost import ActivityHost
from sugar.activity import activityfactory from sugar.activity import activityfactory, bundleregistry
from view.frame.frame import Frame from view.frame.frame import Frame
from view.keyhandler import KeyHandler from view.keyhandler import KeyHandler
import sugar import sugar
@ -113,7 +113,7 @@ class Shell(gobject.GObject):
# Get the service name for this activity, if # Get the service name for this activity, if
# we have a bundle on the system capable of handling # we have a bundle on the system capable of handling
# this activity type # this activity type
breg = self._model.get_bundle_registry() breg = bundleregistry.get_registry()
bundle = breg.get_bundle(bundle_id) bundle = breg.get_bundle(bundle_id)
if not bundle: if not bundle:
logging.error("Couldn't find activity for type %s" % bundle_id) logging.error("Couldn't find activity for type %s" % bundle_id)

3
shell/view/home/FriendView.py
View File

@ -21,6 +21,7 @@ from view.BuddyIcon import BuddyIcon
from sugar.graphics.canvasicon import CanvasIcon from sugar.graphics.canvasicon import CanvasIcon
from sugar.graphics import units from sugar.graphics import units
from sugar.presence import presenceservice from sugar.presence import presenceservice
from sugar.activity import bundleregistry
class FriendView(hippo.CanvasBox): class FriendView(hippo.CanvasBox):
def __init__(self, shell, menu_shell, buddy, **kwargs): def __init__(self, shell, menu_shell, buddy, **kwargs):
@ -45,7 +46,7 @@ class FriendView(hippo.CanvasBox):
self._buddy.connect('color-changed', self._buddy_color_changed_cb) self._buddy.connect('color-changed', self._buddy_color_changed_cb)
def _get_new_icon_name(self, activity): def _get_new_icon_name(self, activity):
registry = shell.get_model().get_bundle_registry() registry = bundleregistry.get_registry()
bundle = registry.get_bundle(activity.get_type()) bundle = registry.get_bundle(activity.get_type())
if bundle: if bundle:
return bundle.get_icon() return bundle.get_icon()