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

Fix exception in FriendView._get_new_icon_name, #4962

Browse Source
This commit is contained in:
Reinier Heeres 2007-11-22 08:15:44 +01:00
parent b57eb0cfab
commit 82e61c6747
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,11 +46,11 @@ class FriendView(hippo.CanvasBox):
self._buddy.connect('disappeared', self._buddy_disappeared_cb) self._buddy.connect('disappeared', self._buddy_disappeared_cb)
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, home_activity): def _get_new_icon_name(self, ps_activity):
registry = activity.get_registry() registry = activity.get_registry()
bundle = registry.get_bundle(home_activity.get_type()) activity_info = registry.get_activity(ps_activity.props.type)
if bundle: if activity_info:
return bundle.get_icon() return activity_info.icon
return None return None
def _remove_activity_icon(self): def _remove_activity_icon(self):
@ -58,14 +58,14 @@ class FriendView(hippo.CanvasBox):
self.remove(self._activity_icon) self.remove(self._activity_icon)
self._activity_icon_visible = False self._activity_icon_visible = False
def _buddy_activity_changed_cb(self, buddy, home_activity=None): def _buddy_activity_changed_cb(self, buddy, ps_activity=None):
if not home_activity: if not ps_activity:
self._remove_activity_icon() self._remove_activity_icon()
return return
# FIXME: use some sort of "unknown activity" icon rather # FIXME: use some sort of "unknown activity" icon rather
# than hiding the icon? # than hiding the icon?
name = self._get_new_icon_name(home_activity) name = self._get_new_icon_name(ps_activity)
if name: if name:
self._activity_icon.props.file_name = name self._activity_icon.props.file_name = name
self._activity_icon.props.xo_color = buddy.get_color() self._activity_icon.props.xo_color = buddy.get_color()