Merge branch 'master' of http://git.woju.eu/qubes/core-admin-linux
This commit is contained in:
commit
c5129a04e0
@ -231,13 +231,18 @@ def main():
|
||||
# the following line is used for time comparison
|
||||
# del new_appmenus[appmenu_file]['Icon']
|
||||
|
||||
icondest = os.path.join(vm.appmenus_template_icons_dir,
|
||||
os.path.splitext(appmenu_file)[0] + '.png')
|
||||
|
||||
try:
|
||||
qubes.imgconverter.Image.get_xdg_icon_from_vm(vm,
|
||||
new_appmenus[appmenu_file]['Icon']).save(
|
||||
os.path.join(vm.appmenus_template_icons_dir,
|
||||
os.path.splitext(appmenu_file)[0] + '.png'))
|
||||
new_appmenus[appmenu_file]['Icon']).save(icondest)
|
||||
except Exception, e:
|
||||
print >> sys.stderr, '----> Failed to get icon for {0}: {1!s}'.format(appmenu_file, e)
|
||||
|
||||
if os.path.exists(icondest):
|
||||
print >> sys.stderr, '-----> Found old icon, using it instead'
|
||||
else:
|
||||
del new_appmenus[appmenu_file]['Icon']
|
||||
|
||||
create_template(os.path.join(vm.appmenus_templates_dir, appmenu_file),
|
||||
|
Loading…
Reference in New Issue
Block a user