Merge branch 'master' of git://dev.laptop.org/sugar

This commit is contained in:
Benjamin Berg
2007-10-16 17:50:14 +02:00
6 changed files with 14 additions and 33 deletions
+1 -4
View File
@@ -148,10 +148,7 @@ class CollapsedEntry(CanvasRoundBox):
mime_type = self.jobject.metadata['mime_type']
if not self._icon_name and mime_type:
type = objecttype.get_registry().get_type_for_mime(mime_type)
if type:
self._icon_name = type.icon
self._icon_name = mime.get_mime_icon(mime_type)
if not self._icon_name:
self._icon_name = 'image-missing'