Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2009-02-16 15:09:17 (GMT)
committer Simon Schampijer <simon@schampijer.de>2009-02-16 15:09:17 (GMT)
commitfb468b81011442b734d5745cba145b9afaf804c4 (patch)
tree9ab4f089684b9632e63b27863e3e1d3f06cc5145 /src/jarabe
parent6c3cb5dc5d5ca1bc523494f4c4c08b588847a5da (diff)
Method _get_icon_file_name moved to sugar.graphics.icon
Was part of #353
Diffstat (limited to 'src/jarabe')
-rw-r--r--src/jarabe/journal/misc.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index 6346e50..d5d5f6f 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -26,6 +26,7 @@ import gtk
from sugar.activity import activityfactory
from sugar.activity.activityhandle import ActivityHandle
+from sugar.graphics.icon import get_icon_file_name
from sugar import mime
from sugar.bundle.activitybundle import ActivityBundle
from sugar.bundle.contentbundle import ContentBundle
@@ -36,15 +37,6 @@ from jarabe.model import bundleregistry
from jarabe.journal.journalentrybundle import JournalEntryBundle
from jarabe.journal import model
-def _get_icon_file_name(icon_name):
- icon_theme = gtk.icon_theme_get_default()
- info = icon_theme.lookup_icon(icon_name, gtk.ICON_SIZE_LARGE_TOOLBAR, 0)
- if not info:
- return None
- fname = info.get_filename()
- del info
- return fname
-
def get_icon_name(metadata):
file_name = None
@@ -71,12 +63,12 @@ def get_icon_name(metadata):
if not file_name and mime_type:
icons = gio.content_type_get_icon(mime_type)
for icon_name in icons.props.names:
- file_name = _get_icon_file_name(icon_name)
+ file_name = get_icon_file_name(icon_name)
if file_name is not None:
break
if file_name is None or not os.path.exists(file_name):
- file_name = _get_icon_file_name('application-octet-stream')
+ file_name = get_icon_file_name('application-octet-stream')
return file_name