diff options
| author | Benjamin Berg <benjamin@sipsolutions.net> | 2007-10-16 15:50:14 (GMT) |
|---|---|---|
| committer | Benjamin Berg <benjamin@sipsolutions.net> | 2007-10-16 15:50:14 (GMT) |
| commit | 1c1f736a81c69c544f0afd52e091d74189e5af9f (patch) | |
| tree | 514a562153628257103bd51402312614718b6b2b /lib | |
| parent | 977c7d4a9961e8d4d373216d4ae1d4d47ed3a887 (diff) | |
| parent | 69aaa7145eb36926fdc724b57fae36e38526798d (diff) | |
Merge branch 'master' of git://dev.laptop.org/sugar
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sugar/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/sugar/datastore/datastore.py | 4 | ||||
| -rw-r--r-- | lib/sugar/graphics/objectchooser.py | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/lib/sugar/Makefile.am b/lib/sugar/Makefile.am index 8c1946d..3446830 100644 --- a/lib/sugar/Makefile.am +++ b/lib/sugar/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = activity bundle clipboard graphics objects presence datastore +SUBDIRS = activity bundle clipboard graphics presence datastore sugardir = $(pythondir)/sugar sugar_PYTHON = \ diff --git a/lib/sugar/datastore/datastore.py b/lib/sugar/datastore/datastore.py index 77ca117..6b419a4 100644 --- a/lib/sugar/datastore/datastore.py +++ b/lib/sugar/datastore/datastore.py @@ -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 diff --git a/lib/sugar/graphics/objectchooser.py b/lib/sugar/graphics/objectchooser.py index 114665f..7522a9d 100644 --- a/lib/sugar/graphics/objectchooser.py +++ b/lib/sugar/graphics/objectchooser.py @@ -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' |