From df4ed03b83e213b292f6f3cb800acd2d5fa08870 Mon Sep 17 00:00:00 2001 From: Stephen Collins Date: Tue, 19 Mar 2019 23:28:46 -0600 Subject: [PATCH] Spices.py: fix disabling of desklets and extensions This was broken by #8309 which fixed an issue with applets but the fix didn't consider that desklets and extensions use a slightly different format for the gsettings key. This commit adds handling for all extension types. --- files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py | 9 ++++++++- 1 file changed, 8 insertions(+), 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 bfef95c3d7..d097cc5766 100644 --- a/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py +++ b/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py @@ -774,7 +774,14 @@ def disable_extension(self, uuid): enabled_extensions = self.settings.get_strv(self.enabled_key) new_list = [] for enabled_extension in enabled_extensions: - if enabled_extension.split(':')[3].strip('!') != uuid: + if self.collection_type == 'applet': + enabled_uuid = enabled_extension.split(':')[3].strip('!') + elif self.collection_type == 'desklet': + enabled_uuid = enabled_extension.split(':')[0].strip('!') + else: + enabled_uuid = enabled_extension + + if enabled_uuid != uuid: new_list.append(enabled_extension) self.settings.set_strv(self.enabled_key, new_list)