diff --git a/appmenus-scripts/qubes-core-appmenus.py b/appmenus-scripts/qubes-core-appmenus.py index 6d5aa5a..f822d3d 100644 --- a/appmenus-scripts/qubes-core-appmenus.py +++ b/appmenus-scripts/qubes-core-appmenus.py @@ -30,7 +30,7 @@ import dbus from qubes.qubes import QubesVm, QubesHVm from qubes.qubes import vm_files, system_path -import qubes.imgconverter +import qubesimgconverter vm_files['appmenus_templates_subdir'] = 'apps.templates' vm_files['appmenus_template_icons_subdir'] = 'apps.tempicons' @@ -203,7 +203,7 @@ def QubesVm_appicons_create(self, srcdir=None, force=False): dst_icon = os.path.join(self.appmenus_icons_dir, icon) if not os.path.exists(dst_icon) or force or \ os.path.getmtime(src_icon) > os.path.getmtime(dst_icon): - qubes.imgconverter.tint(src_icon, dst_icon, self.label.color) + qubesimgconverter.tint(src_icon, dst_icon, self.label.color) def QubesVm_appicons_remove(self): diff --git a/appmenus-scripts/qubes-receive-appmenus b/appmenus-scripts/qubes-receive-appmenus index 75aa0b1..64f25b0 100755 --- a/appmenus-scripts/qubes-receive-appmenus +++ b/appmenus-scripts/qubes-receive-appmenus @@ -33,9 +33,10 @@ from optparse import OptionParser from qubes.qubes import QubesVmCollection, QubesException, system_path from qubes.qubes import QubesHVm from qubes.qubes import vm_files -import qubes.imgconverter from qubes.qubes import vmm +import qubesimgconverter + # fields required to be present (and verified) in retrieved desktop file required_fields = ["Name", "Exec"] @@ -331,13 +332,13 @@ def main(): os.path.splitext(appmenu_file)[0] + '.png') try: - icon = qubes.imgconverter.Image. \ + icon = qubesimgconverter.Image. \ get_xdg_icon_from_vm(vm, new_appmenus[ appmenu_file][ 'Icon']) if os.path.exists(icondest): - old_icon = qubes.imgconverter.Image.load_from_file(icondest) + old_icon = qubesimgconverter.Image.load_from_file(icondest) else: old_icon = None if old_icon is None or icon != old_icon: