favoritesview.py: icon-color KeyError #976

1 files changed, 8 insertions, 0 deletions

diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index 5ea1d24..a9baec8 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -20,10 +20,12 @@ import os
 from gettext import gettext as _
 
 import gio
+import gconf
 
 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 import mime
 from sugar.bundle.activitybundle import ActivityBundle
 from sugar.bundle.contentbundle import ContentBundle
@@ -229,3 +231,9 @@ def is_bundle(metadata):
     return is_activity_bundle(metadata) or is_content_bundle(metadata) or \
             is_journal_bundle(metadata)
 
+def get_icon_color(metadata):
+    if metadata is None or not 'icon-color' in metadata:
+        client = gconf.client_get_default()
+        return XoColor(client.get_string('/desktop/sugar/user/color'))
+    else:
+        return XoColor(metadata['icon-color'])