From 8523fe34e724f2c3bc9e3e435330fb6ac3acc715 Mon Sep 17 00:00:00 2001 From: Stephen Collins Date: Thu, 17 Jan 2019 19:02:50 -0700 Subject: [PATCH] Spices.py: fix a bug causing gwl to be removed when wl is disabled This fixes a bug in which disabling an applet with a uuid that is a sub-string of another uuid will cause both to be disabled. For example, disabling window-list@cinnamon.org will incorrectly cause any instances of grouped-window-list@cinnamon.org to also be removed. --- files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py b/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py index 89ca5e7437..bfef95c3d7 100644 --- a/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py +++ b/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py @@ -774,7 +774,7 @@ def disable_extension(self, uuid): enabled_extensions = self.settings.get_strv(self.enabled_key) new_list = [] for enabled_extension in enabled_extensions: - if uuid not in enabled_extension: + if enabled_extension.split(':')[3].strip('!') != uuid: new_list.append(enabled_extension) self.settings.set_strv(self.enabled_key, new_list)