From e90c8a97fff936956b0f1168e6aa455b9011b743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 14 Jul 2016 04:32:16 +0200 Subject: [PATCH] appmenus: fix detection of desktop environment In Fedora 23-based dom0, DESKTOP_SESSION environment contains full path to session file, instead of just basename. QubesOS/qubes-issues#1606 --- appmenus-scripts/qubes-core-appmenus.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appmenus-scripts/qubes-core-appmenus.py b/appmenus-scripts/qubes-core-appmenus.py index f999a3e..6d5aa5a 100644 --- a/appmenus-scripts/qubes-core-appmenus.py +++ b/appmenus-scripts/qubes-core-appmenus.py @@ -319,7 +319,7 @@ def QubesVm_label_setter(self, _): # Apparently desktop environments heavily caches the icons, # see #751 for details - if os.environ.get("DESKTOP_SESSION", "") == "kde-plasma": + if "plasma" in os.environ.get("DESKTOP_SESSION", ""): try: os.unlink(os.path.expandvars( "$HOME/.kde/cache-$HOSTNAME/icon-cache.kcache")) @@ -337,7 +337,7 @@ def QubesVm_label_setter(self, _): dbus_interface="org.freedesktop.Notifications") except: pass - elif os.environ.get("DESKTOP_SESSION", "") == "xfce": + elif "xfce" in os.environ.get("DESKTOP_SESSION", ""): self.appmenus_remove() self.appmenus_create()