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

2007-10-16 17:50:14 +02:00
parent 977c7d4a99 69aaa7145e
commit 1c1f736a81
6 changed files with 14 additions and 33 deletions
@@ -1,4 +1,4 @@
-SUBDIRS = activity bundle clipboard graphics objects presence datastore
+SUBDIRS = activity bundle clipboard graphics presence datastore

 sugardir = $(pythondir)/sugar
 sugar_PYTHON =		\
@@ -137,9 +137,9 @@ class DSObject(object):
        mime_type = self.metadata.get('mime_type', '')
        if mime_type:
            activities_info = self._get_activities_for_mime(mime_type)
-            for info in activities_info:
+            for activity_info in activities_info:
                if activity_info.bundle_id != bundle_id:
-                    activities.append(info)
+                    activities.append(activity_info)

        return activities

@@ -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'