Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorReinier Heeres <reinier@heeres.eu>2007-11-22 07:15:44 (GMT)
committer Reinier Heeres <reinier@heeres.eu>2007-11-22 07:15:44 (GMT)
commit82e61c6747c40ea4ae1c65510cd9e4740719bafa (patch)
treee8dca9354149e8aded0e1edcddf4ca7cef1d6cf2 /shell
parentb57eb0cfabc307a0dcb5e923b55344e2795020be (diff)
Fix exception in FriendView._get_new_icon_name, #4962
Diffstat (limited to 'shell')
-rw-r--r--shell/view/home/FriendView.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/shell/view/home/FriendView.py b/shell/view/home/FriendView.py
index 3a6c5b8..786589f 100644
--- a/shell/view/home/FriendView.py
+++ b/shell/view/home/FriendView.py
@@ -46,11 +46,11 @@ class FriendView(hippo.CanvasBox):
self._buddy.connect('disappeared', self._buddy_disappeared_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()
- bundle = registry.get_bundle(home_activity.get_type())
- if bundle:
- return bundle.get_icon()
+ activity_info = registry.get_activity(ps_activity.props.type)
+ if activity_info:
+ return activity_info.icon
return None
def _remove_activity_icon(self):
@@ -58,14 +58,14 @@ class FriendView(hippo.CanvasBox):
self.remove(self._activity_icon)
self._activity_icon_visible = False
- def _buddy_activity_changed_cb(self, buddy, home_activity=None):
- if not home_activity:
+ def _buddy_activity_changed_cb(self, buddy, ps_activity=None):
+ if not ps_activity:
self._remove_activity_icon()
return
# FIXME: use some sort of "unknown activity" icon rather
# than hiding the icon?
- name = self._get_new_icon_name(home_activity)
+ name = self._get_new_icon_name(ps_activity)
if name:
self._activity_icon.props.file_name = name
self._activity_icon.props.xo_color = buddy.get_color()