Rename IconColor to XoColor.

sugar/graphics/Makefile.am

@@ -9,7 +9,6 @@ sugar_PYTHON =			\
 	entry.py                \
 	font.py			\
 	frame.py		\
-	iconcolor.py		\
 	label.py		\
 	menu.py			\
 	menushell.py		\
@@ -21,4 +20,5 @@ sugar_PYTHON =			\
 	spreadbox.py		\
 	timeline.py         	\
 	toolbar.py		\
-	units.py
+	units.py		\
+	xocolor.py

sugar/graphics/canvasicon.py

@@ -24,7 +24,6 @@ import rsvg
 import cairo
 import time
 
-from sugar.graphics.iconcolor import IconColor
 from sugar.graphics.timeline import Timeline
 from sugar.graphics.popup import Popup
 from sugar.graphics import color

sugar/graphics/iconbutton.py

@@ -21,7 +21,7 @@ import gobject
 import hippo
 
 from canvasicon import CanvasIcon
-from iconcolor import IconColor
+from xocolor import XoColor
 from sugar.graphics import units
 from sugar import profile
             
@@ -47,11 +47,11 @@ class IconButton(CanvasIcon):
         if self.props.color:
             self._normal_color = self.props.color
         else:
-            self._normal_color = IconColor('white')
+            self._normal_color = XoColor('white')
             self.props.color = self._normal_color
 
         self._prelight_color = profile.get_color()
-        self._inactive_color = IconColor('#808080,#424242')
+        self._inactive_color = XoColor('#808080,#424242')
         self._set_size(STANDARD_SIZE)
 
         self.connect('button-press-event', self._button_press_event_cb)

sugar/graphics/xocolor.py

@@ -595,7 +595,7 @@ def _parse_string(color_string):
 def is_valid(color_string):
     return (_parse_string(color_string) != None)
 
-class IconColor:
+class XoColor:
     def __init__(self, color_string=None):
         if color_string == None or not is_valid(color_string):
             n = int(random.random() * (len(_colors) - 1))