Skip to content

Commit 364d3f9

Browse files
Merge branch 'main' into lenemter/guess-app
2 parents 0bdf0b4 + ed88ffb commit 364d3f9

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/DesktopIntegration.vala

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ public class Gala.DesktopIntegration : GLib.Object {
3737
unowned var display = wm.get_display ();
3838
unowned var workspace_manager = display.get_workspace_manager ();
3939

40-
workspace_manager.active_workspace_changed.connect (() => {
41-
active_workspace_changed ();
42-
windows_changed (); // windows have 'on-active-workspace' property that we need to update
43-
});
40+
workspace_manager.active_workspace_changed.connect (() => active_workspace_changed ());
4441
workspace_manager.workspaces_reordered.connect (() => windows_changed ());
4542
workspace_manager.workspace_added.connect (() => windows_changed ());
4643
workspace_manager.workspace_removed.connect ((index) => {
@@ -99,7 +96,6 @@ public class Gala.DesktopIntegration : GLib.Object {
9996
public Window[] get_windows () throws GLib.DBusError, GLib.IOError {
10097
Window[] returned_windows = {};
10198
var apps = Gala.AppSystem.get_default ().get_running_apps ();
102-
unowned var active_workspace = wm.get_display ().get_workspace_manager ().get_active_workspace ();
10399
foreach (unowned var app in apps) {
104100
foreach (weak Meta.Window window in app.get_windows ()) {
105101
if (!is_eligible_window (window)) {
@@ -116,7 +112,6 @@ public class Gala.DesktopIntegration : GLib.Object {
116112
properties.insert ("client-type", new GLib.Variant.uint32 (window.get_client_type ()));
117113
properties.insert ("is-hidden", new GLib.Variant.boolean (window.is_hidden ()));
118114
properties.insert ("has-focus", new GLib.Variant.boolean (window.has_focus ()));
119-
properties.insert ("on-active-workspace", new GLib.Variant.boolean (window.located_on_workspace (active_workspace)));
120115
properties.insert ("workspace-index", new GLib.Variant.int32 (window.get_workspace ().index ()));
121116
properties.insert ("width", new GLib.Variant.uint32 (frame_rect.width));
122117
properties.insert ("height", new GLib.Variant.uint32 (frame_rect.height));

0 commit comments

Comments
 (0)