workspace, workspaceThumbnail: Fix another bad rebase

It seems I pushed an old version of the patch by accident.
This commit is contained in:
Jasper St. Pierre 2013-01-14 12:38:02 -05:00
parent 6054ab35cb
commit d2c45f428f
2 changed files with 4 additions and 4 deletions

View File

@ -1531,11 +1531,11 @@ const Workspace = new Lang.Class({
this.leavingOverview = false; this.leavingOverview = false;
}, },
// Tests if @win belongs to this workspaces and monitor // Tests if @actor belongs to this workspaces and monitor
_isMyWindow : function (actor) { _isMyWindow : function (actor) {
let win = actor.meta_window; let win = actor.meta_window;
return (this.metaWorkspace == null || win.located_on_workspace(this.metaWorkspace)) && return (this.metaWorkspace == null || win.located_on_workspace(this.metaWorkspace)) &&
(!win.get_monitor() == this.monitorIndex); (win.get_monitor() == this.monitorIndex);
}, },
// Tests if @win should be shown in the Overview // Tests if @win should be shown in the Overview

View File

@ -380,11 +380,11 @@ const WorkspaceThumbnail = new Lang.Class({
this.actor = null; this.actor = null;
}, },
// Tests if @win belongs to this workspace and monitor // Tests if @actor belongs to this workspace and monitor
_isMyWindow : function (actor) { _isMyWindow : function (actor) {
let win = actor.meta_window; let win = actor.meta_window;
return win.located_on_workspace(this.metaWorkspace) && return win.located_on_workspace(this.metaWorkspace) &&
(!win.get_monitor() == this.monitorIndex); (win.get_monitor() == this.monitorIndex);
}, },
// Tests if @win should be shown in the Overview // Tests if @win should be shown in the Overview