From 501022c88d504a7f5a05796855263deede08e2b4 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Sun, 15 Jul 2007 10:51:06 +0000
Subject: #775 Show the activity's creator colors in the donut. (Patch from Dan Winship)

---
diff --git a/NEWS b/NEWS
index 4a58dec..bc1625f 100644
--- a/NEWS
+++ b/NEWS
@@ -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
--
cgit v0.9.1