gwl: Improve window state management

Author: anaximeno

files/usr/share/cinnamon/applets/[email protected]/appGroup.js

@@ -988,6 +988,8 @@ class AppGroup {
 
         this.signals.disconnect('notify::title', metaWindow);
         this.signals.disconnect('notify::appears-focused', metaWindow);
+        this.signals.disconnect('notify::icon', metaWindow);
+        this.signals.disconnect('notify::progress', metaWindow);
 
         this.groupState.metaWindows.splice(refWindow, 1);
 

files/usr/share/cinnamon/applets/[email protected]/workspace.js

@@ -351,15 +351,17 @@ class Workspace {
     windowRemoved(metaWorkspace, metaWindow) {
         if (!this.state) return;
 
-        if ((metaWindow.is_on_all_workspaces() || this.state.settings.showAllWorkspaces
-            || !this.state.settings.showAllWorkspaces)
+        // Abort the remove if the window is just changing workspaces, window
+        // should always remain indexed on all workspaces while its mapped.
+        // if (!metaWindow.showing_on_its_workspace()) return;
+        if ((this.state.settings.showAllWorkspaces) && (metaWindow.has_focus()
+            && global.workspace_manager.get_active_workspace_index()
+            !== metaWorkspace.index())) return;
+
+        // If the window is on all workspaces or we're showing all workspaces,
+        // make sure to remove the window from all workspaces.
+        if ((metaWindow.is_on_all_workspaces() || this.state.settings.showAllWorkspaces)
             && !this.state.removingWindowFromWorkspaces) {
-            // Abort the remove if the window is just changing workspaces, window
-            // should always remain indexed on all workspaces while its mapped.
-            // if (!metaWindow.showing_on_its_workspace()) return;
-            if ((this.state.settings.showAllWorkspaces) && (metaWindow.has_focus()
-                && global.workspace_manager.get_active_workspace_index()
-                !== metaWorkspace.index())) return;
             this.state.removingWindowFromWorkspaces = true;
             this.state.trigger('removeWindowFromAllWorkspaces', metaWindow);
             return;