From fd529f2c7dae5dc26b5a065575ea75059414b8c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 19 Apr 2016 23:11:10 +0200 Subject: [PATCH] appmenus: force changing appicons when VM label is changed Fixes QubesOS/qubes-issues#1606 (cherry picked from commit 4694f5f52f9456869c58da469cddcc4ab87c3ddf) --- appmenus-scripts/qubes-core-appmenus.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appmenus-scripts/qubes-core-appmenus.py b/appmenus-scripts/qubes-core-appmenus.py index 0f75de9..f999a3e 100644 --- a/appmenus-scripts/qubes-core-appmenus.py +++ b/appmenus-scripts/qubes-core-appmenus.py @@ -169,7 +169,7 @@ def QubesVm_appmenus_replace_entry(self, old_name, new_name): f.write(''.join(new_lines)) -def QubesVm_appicons_create(self, srcdir=None): +def QubesVm_appicons_create(self, srcdir=None, force=False): if srcdir is None: srcdir = self.appmenus_template_icons_dir if srcdir is None: @@ -201,7 +201,7 @@ def QubesVm_appicons_create(self, srcdir=None): src_icon = os.path.join(srcdir, icon) dst_icon = os.path.join(self.appmenus_icons_dir, icon) - if not os.path.exists(dst_icon) or \ + 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) @@ -315,7 +315,7 @@ def QubesVm_remove_from_disk(self): def QubesVm_label_setter(self, _): - self.appicons_create() + self.appicons_create(force=True) # Apparently desktop environments heavily caches the icons, # see #751 for details