From 9e5d3c11177fb6c6aae9beeeef61eb7ca5e74fc5 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Fri, 31 Aug 2007 09:38:09 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
(limited to 'sugar')

diff --git a/sugar/graphics/icon.py b/sugar/graphics/icon.py
index 133e256..c710f1a 100644
--- a/sugar/graphics/icon.py
+++ b/sugar/graphics/icon.py
@@ -373,8 +373,12 @@ class Icon(gtk.Image):
 
     def do_set_property(self, pspec, value):
         if pspec.name == 'xo-color':
-            self.props.fill_color = value.get_fill_color()
-            self.props.stroke_color = value.get_stroke_color()
+            if value is None:
+                self.props.fill_color = None
+                self.props.stroke_color = None
+            else:
+                self.props.fill_color = value.get_fill_color()
+                self.props.stroke_color = value.get_stroke_color()
         elif pspec.name == 'fill-color':
             self._buffer.fill_color = value
         elif pspec.name == 'stroke-color':
@@ -433,8 +437,12 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
             self._buffer.icon_name = value
             self.emit_paint_needed(0, 0, -1, -1)
         elif pspec.name == 'xo-color':
-            self.props.fill_color = value.get_fill_color()
-            self.props.stroke_color = value.get_stroke_color()
+            if value is None:
+                self.props.fill_color = None
+                self.props.stroke_color = None
+            else:
+                self.props.fill_color = value.get_fill_color()
+                self.props.stroke_color = value.get_stroke_color()
         elif pspec.name == 'fill-color':
             if not isinstance(value, basestring) and value is not None:
                 raise TypeError('fill-color must be a string, not %r' % type(value))
--
cgit v0.9.1