Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe/journal/expandedentry.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/jarabe/journal/expandedentry.py')
-rw-r--r--src/jarabe/journal/expandedentry.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index fdf3478..94d90ed 100644
--- a/src/jarabe/journal/expandedentry.py
+++ b/src/jarabe/journal/expandedentry.py
@@ -180,13 +180,11 @@ class ExpandedEntry(hippo.CanvasBox):
self._icon_button_release_event_cb)
if misc.is_activity_bundle(self._metadata):
- icon.props.fill_color = style.COLOR_TRANSPARENT.get_svg()
- icon.props.stroke_color = style.COLOR_BUTTON_GREY.get_svg()
+ xo_color = XoColor('%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(),
+ style.COLOR_TRANSPARENT.get_svg()))
else:
- if self._metadata.has_key('icon-color') and \
- self._metadata['icon-color']:
- icon.props.xo_color = XoColor( \
- self._metadata['icon-color'])
+ xo_color = misc.get_icon_color(self._metadata)
+ icon.props.xo_color = xo_color
icon.set_palette(ObjectPalette(self._metadata))