Rename IconColor to XoColor.

shell/model/BuddyModel.py

@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 from sugar.presence import PresenceService
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 import gobject
 
 _NOT_PRESENT_COLOR = "#888888,#BBBBBB"
@@ -67,7 +67,7 @@ class BuddyModel(gobject.GObject):
             self.__set_color_from_string(_NOT_PRESENT_COLOR)
 
     def __set_color_from_string(self, color_string):
-        self._color = IconColor(color_string)
+        self._color = XoColor(color_string)
 
     def get_name(self):
         return self._name

shell/model/MeshModel.py

@@ -16,7 +16,7 @@
 
 import gobject
 
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 from sugar.presence import PresenceService
 from sugar.activity import bundleregistry
 from model.BuddyModel import BuddyModel
@@ -34,7 +34,7 @@ class ActivityModel:
         return self._bundle.get_icon()
     
     def get_color(self):
-        return IconColor(self._activity.get_color())
+        return XoColor(self._activity.get_color())
 
     def get_service(self):
         return self._service

shell/model/homeactivity.py

@@ -20,7 +20,7 @@ import logging
 import gobject
 import dbus
 
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 from sugar.presence import PresenceService
 from sugar import profile
 
@@ -100,7 +100,7 @@ class HomeActivity(gobject.GObject):
     def get_icon_color(self):
         activity = PresenceService.get_instance().get_activity(self._id)
         if activity != None:
-            return IconColor(activity.get_color())
+            return XoColor(activity.get_color())
         else:
             return profile.get_color()