Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar/graphics
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2007-07-24 09:46:14 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2007-07-24 09:46:14 (GMT)
commit3e40075a80c2b04cd1693b48e8b1ff09699bf0a3 (patch)
tree272ff1ac5b345bd1f26990d6111ee3d742624c90 /sugar/graphics
parent998a338afc4ad01124c27bb86b297776a6ed8619 (diff)
parentb886121c100d314b7c098d92e10c5a7068fd1070 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'sugar/graphics')
-rw-r--r--sugar/graphics/objectchooser.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/sugar/graphics/objectchooser.py b/sugar/graphics/objectchooser.py
index 0d42a7a..aea8315 100644
--- a/sugar/graphics/objectchooser.py
+++ b/sugar/graphics/objectchooser.py
@@ -116,8 +116,11 @@ class CollapsedEntry(Frame):
self.append(date)
icon = CanvasIcon(icon_name=self._get_icon_name(),
- xo_color=XoColor(self.jobject.metadata['icon-color']),
box_width=units.grid_to_pixels(1))
+
+ if self.jobject.metadata.has_key('icon-color'):
+ icon.props.xo_color = XoColor(self.jobject.metadata['icon-color'])
+
self.append(icon)
title = hippo.CanvasText(text=self._format_title(),