#4409 Fix showing malformed bundles.

5 files changed, 11 insertions, 11 deletions

diff --git a/NEWS b/NEWS
index dda70da..cfceebf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+* #4409 Fix showing malformed bundles. (tomeu)
+
 69
 
 * #4704 Fix mounting of removable devices. (tomeu)
diff --git a/collapsedentry.py b/collapsedentry.py
index 287b402..fae9a35 100644
--- a/collapsedentry.py
+++ b/collapsedentry.py
@@ -245,8 +245,7 @@ class CollapsedEntry(hippo.CanvasBox):
         if jobject.is_activity_bundle():
             self._icon.props.fill_color=style.COLOR_TRANSPARENT.get_svg()
             self._icon.props.stroke_color=style.COLOR_BLACK.get_svg()
-            text = self._format_title().split('-')
-            self._title.props.text = text[0] + _(' Activity ') + text[1]
+            self._title.props.text = self._format_title() + _(' Activity')
         else:    
             if jobject.metadata.has_key('icon-color') and \
                    jobject.metadata['icon-color']:
diff --git a/expandedentry.py b/expandedentry.py
index 78add0a..230b3c0 100644
--- a/expandedentry.py
+++ b/expandedentry.py
@@ -161,8 +161,7 @@ class ExpandedEntry(hippo.CanvasBox):
 
         text = self._jobject.metadata.get('title', _('Untitled'))
         if self._jobject.is_activity_bundle():
-            tmp = text.split('-')
-            title.props.text = tmp[0] + _(' Activity ') + tmp[1]
+            title.props.text = text + _(' Activity')
         else:    
             title.props.text = text
             
diff --git a/listview.py b/listview.py
index a520e4b..6c05d13 100644
--- a/listview.py
+++ b/listview.py
@@ -16,6 +16,8 @@
 
 import os
 import logging
+import traceback
+import sys
 
 import hippo
 import gobject
@@ -146,7 +148,8 @@ class ListView(gtk.HBox):
                         entry = self._entries[i]
                         entry.set_visible(False)
             except Exception, e:
-                logging.error('Exception while displaying entry: %r' % e)
+                logging.error('Exception while displaying entry:\n' + \
+                    ''.join(traceback.format_exception(*sys.exc_info())))
 
     def update_with_query(self, query):
         logging.debug('ListView.update_with_query')
diff --git a/misc.py b/misc.py
index 02ae039..e52dc64 100644
--- a/misc.py
+++ b/misc.py
@@ -17,6 +17,8 @@
 from gettext import gettext as _
 import logging
 import time
+import traceback
+import sys
 
 import gtk
 
@@ -48,15 +50,10 @@ def get_icon_name(jobject):
         try:
             bundle = ActivityBundle(jobject.file_path)
             file_name = bundle.get_icon()
-        except IOError:
-            import traceback
-            import sys
+        except:
             logging.warning('Could not read bundle:\n' + \
                 ''.join(traceback.format_exception(*sys.exc_info())))
             return _get_icon_file_name('application-octet-stream')
-        except MalformedBundleException, e:
-            logging.warning('Incorrect bundle: %r' % e)
-            return _get_icon_file_name('application-octet-stream')
 
     if jobject.metadata['activity']:
         service_name = jobject.metadata['activity']