Skip to content

Commit 1f56454

Browse files
committed
gwl: don't pass the wrong arguments to windowRemoved.
The screen object has itself as the first argument, not workspace. Use window.unmanaged instead (since that's what triggers the (deprecated) screen signal in the first place).
1 parent b90b06a commit 1f56454

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -891,6 +891,7 @@ class AppGroup {
891891
this.signals.connect(metaWindow, 'notify::appears-focused', (...args) => this.onFocusWindowChange(...args));
892892
this.signals.connect(metaWindow, 'notify::gtk-application-id', (w) => this.onAppChange(w));
893893
this.signals.connect(metaWindow, 'notify::wm-class', (w) => this.onAppChange(w));
894+
this.signals.connect(metaWindow, 'unmanaged', (w) => this.onAppChange(w));
894895

895896
this.signals.connect(metaWindow, 'notify::icon', (w) => this.setIcon(w));
896897

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class AppList {
5252
// Connect all the signals
5353
this.signals.connect(global.screen, 'window-workspace-changed', (...args) => this.windowWorkspaceChanged(...args));
5454
// Ugly change: refresh the removed app instances from all workspaces
55-
this.signals.connect(global.screen, 'window-removed', (...args) => this.windowRemoved(...args));
5655
this.signals.connect(this.metaWorkspace, 'window-removed', (...args) => this.windowRemoved(...args));
5756
this.signals.connect(global.window_manager, 'switch-workspace' , (...args) => this.reloadList(...args));
5857
this.on_orientation_changed(null, true);
@@ -347,7 +346,7 @@ class AppList {
347346
// should always remain indexed on all workspaces while its mapped.
348347
// if (!metaWindow.showing_on_its_workspace()) return;
349348
if ((this.state.settings.showAllWorkspaces) && (metaWindow.has_focus()
350-
&& global.screen.get_active_workspace_index()
349+
&& global.workspace_manager.get_active_workspace_index()
351350
!== metaWorkspace.index())) return;
352351
this.state.removingWindowFromWorkspaces = true;
353352
this.state.trigger('removeWindowFromAllWorkspaces', metaWindow);

0 commit comments

Comments
 (0)