diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-07-15 10:51:06 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-07-15 10:51:06 (GMT) |
| commit | 501022c88d504a7f5a05796855263deede08e2b4 (patch) | |
| tree | 0f58b2548e19b212bb78be3f1572eefd3cf37713 | |
| parent | 66ea9997cb46d0a42db3a6330e20db89b4421d79 (diff) | |
#775 Show the activity's creator colors in the donut. (Patch from Dan Winship)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | shell/model/homeactivity.py | 2 | ||||
| -rw-r--r-- | shell/view/home/activitiesdonut.py | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -1,3 +1,4 @@ +* #775 Show the activity's creator colors in the donut. (danw) * #2185 Do not shutdown on power button, ohm does it now. (marco) * #1888 Choose the correct mime type when adding text from Write to the clipboard. (tomeu) diff --git a/shell/model/homeactivity.py b/shell/model/homeactivity.py index f79bcc8..4ee06d4 100644 --- a/shell/model/homeactivity.py +++ b/shell/model/homeactivity.py @@ -115,7 +115,7 @@ class HomeActivity(gobject.GObject): pservice = presenceservice.get_instance() activity = pservice.get_activity(self._activity_id) if activity != None: - return XoColor(activity.get_color()) + return XoColor(activity.props.color) else: return profile.get_color() diff --git a/shell/view/home/activitiesdonut.py b/shell/view/home/activitiesdonut.py index b0a1c09..3ddb285 100644 --- a/shell/view/home/activitiesdonut.py +++ b/shell/view/home/activitiesdonut.py @@ -47,7 +47,7 @@ class ActivityIcon(CanvasIcon): def __init__(self, activity): icon_name = activity.get_icon_name() - self._orig_color = profile.get_color() + self._orig_color = activity.get_icon_color() self._icon_colors = self._compute_icon_colors() self._direction = 0 |