cinnamon-settings themes: Check both new and legacy theme folders

when uninstalling.

Fix a gsettings warning also (themes don't have an -enabled setting).

Fixes #11336.

Author: mtwebster

files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py

@@ -706,7 +706,8 @@ def _uninstall(self, job):
                     shutil.rmtree(os.path.join(settings_dir, uuid))
                 if os.path.exists(os.path.join(old_settings_dir, uuid)):
                     shutil.rmtree(os.path.join(old_settings_dir, uuid))
-            shutil.rmtree(os.path.join(self.install_folder, uuid))
+            for folder in self.spices_directories:
+                shutil.rmtree(os.path.join(folder, uuid), ignore_errors=True)
         except Exception as detail:
             self.errorMessage(_("A problem occurred while removing %s.") % job['uuid'], str(detail))
 
@@ -776,6 +777,9 @@ def enable_extension(self, uuid, panel=1, box='right', position=0):
             self.settings.set_strv(self.enabled_key, enabled)
 
     def disable_extension(self, uuid):
+        if self.themes:
+            return
+
         enabled_extensions = self.settings.get_strv(self.enabled_key)
         new_list = []
         for enabled_extension in enabled_extensions: