From 7779c74f447ca165effc649451cefb87c2abf842 Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Thu, 14 Jul 2016 16:20:22 +1000 Subject: [PATCH] Bundlebuilder: Use installed icon path in .desktop file Previously, the bundle builder referenced the icon path in the source directory - which was obviously not installed in the package. --- src/sugar3/activity/bundlebuilder.py | 3 ++- src/sugar3/bundle/activitybundle.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sugar3/activity/bundlebuilder.py b/src/sugar3/activity/bundlebuilder.py index ae70b695..74020586 100644 --- a/src/sugar3/activity/bundlebuilder.py +++ b/src/sugar3/activity/bundlebuilder.py @@ -333,7 +333,8 @@ class Installer(Packager): cp.set(section, 'Terminal', 'false') cp.set(section, 'Type', 'Application') cp.set(section, 'Categories', 'Education;') - cp.set(section, 'Icon', self.config.bundle.get_icon()) + cp.set(section, 'Icon', os.path.join( + activity_path, 'activity', self.config.bundle.get_icon_filename())) cp.set(section, 'Exec', self.config.bundle.get_command()) cp.set(section, 'Path', activity_path) # Path == CWD for running diff --git a/src/sugar3/bundle/activitybundle.py b/src/sugar3/bundle/activitybundle.py index b7628baa..414489c8 100644 --- a/src/sugar3/bundle/activitybundle.py +++ b/src/sugar3/bundle/activitybundle.py @@ -286,6 +286,10 @@ class ActivityBundle(Bundle): os.close(temp_file) return temp_file_path + def get_icon_filename(self): + '''Get the icon file name''' + return self._icon + '.svg' + def get_activity_version(self): """Get the activity version""" return self._activity_version