Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe/journal/misc.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/jarabe/journal/misc.py')
-rw-r--r--src/jarabe/journal/misc.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index 52a86fa..f481644 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -65,17 +65,20 @@ def get_icon_name(metadata):
if file_name is None and is_activity_bundle(metadata):
file_path = model.get_file(metadata['uid'])
- if os.path.exists(file_path):
+ if file_path is not None and os.path.exists(file_path):
try:
bundle = ActivityBundle(file_path)
file_name = bundle.get_icon()
- except Exception:
+ except:
logging.warning('Could not read bundle:\n' + \
- ''.join(traceback.format_exception(*sys.exc_info())))
+ traceback.format_exc())
if file_name is None:
file_name = _get_icon_for_mime(metadata.get('mime_type', ''))
+ if file_name is None:
+ file_name = get_icon_file_name('application-octet-stream')
+
return file_name
def get_date(metadata):