Check for activity bundle colors in misc.get_icon_color()

3 files changed, 7 insertions, 15 deletions

diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index d5f095b..048fecf 100644
--- a/src/jarabe/journal/expandedentry.py
+++ b/src/jarabe/journal/expandedentry.py
@@ -174,13 +174,7 @@ class ExpandedEntry(hippo.CanvasBox):
         icon.connect_after('button-release-event',
                            self._icon_button_release_event_cb)
 
-        if misc.is_activity_bundle(self._metadata):
-            xo_color = XoColor('%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(),
-                                          style.COLOR_TRANSPARENT.get_svg()))
-        else:
-            xo_color = misc.get_icon_color(self._metadata)
-        icon.props.xo_color = xo_color
-
+        icon.props.xo_color = misc.get_icon_color(self._metadata)
         icon.set_palette(ObjectPalette(self._metadata))
 
         return icon
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index 24ad216..7a7489c 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -27,6 +27,7 @@ from sugar.activity import activityfactory
 from sugar.activity.activityhandle import ActivityHandle
 from sugar.graphics.icon import get_icon_file_name
 from sugar.graphics.xocolor import XoColor
+from sugar.graphics import style
 from sugar import mime
 from sugar.bundle.activitybundle import ActivityBundle
 from sugar.bundle.contentbundle import ContentBundle
@@ -244,7 +245,10 @@ def is_bundle(metadata):
             is_journal_bundle(metadata)
 
 def get_icon_color(metadata):
-    if metadata is None or not 'icon-color' in metadata:
+    if metadata is not None and is_activity_bundle(metadata):
+        xo_color = XoColor('%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(),
+                                      style.COLOR_TRANSPARENT.get_svg()))
+    elif metadata is None or not 'icon-color' in metadata:
         client = gconf.client_get_default()
         return XoColor(client.get_string('/desktop/sugar/user/color'))
     else:
diff --git a/src/jarabe/journal/widgets.py b/src/jarabe/journal/widgets.py
index e2bd842..a6386c3 100644
--- a/src/jarabe/journal/widgets.py
+++ b/src/jarabe/journal/widgets.py
@@ -31,7 +31,6 @@ from sugar.graphics.icon import CanvasIcon
 from sugar.graphics.xocolor import XoColor
 from sugar.graphics.palette import Invoker
 from sugar.graphics.palette import WidgetInvoker
-from sugar.graphics.roundbox import CanvasRoundBox
 
 from jarabe.journal.entry import Entry
 from jarabe.journal.palettes import BuddyPalette
@@ -146,12 +145,7 @@ class ObjectIconCanvas(_Launcher, CanvasIcon):
         self.palette = None
 
         self.props.file_name = misc.get_icon_name(metadata)
-
-        if misc.is_activity_bundle(metadata):
-            self.props.fill_color = style.COLOR_TRANSPARENT.get_svg()
-            self.props.stroke_color = style.COLOR_BUTTON_GREY.get_svg()
-        else:
-            self.props.xo_color = misc.get_icon_color(metadata)
+        self.props.xo_color = misc.get_icon_color(metadata)
 
 
 def ObjectIcon(**kwargs):