From 737f395d6c08f7907ee573992764bebb385d54ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 27 Jun 2011 18:59:56 +0200 Subject: [PATCH] dnd: Rename DND.removeMonitor() to DND.removeDragMonitor() DND.addDragMonitor() and DND.removeMonitor() are inconsistently named, so rename the latter. https://bugzilla.gnome.org/show_bug.cgi?id=652730 --- js/ui/dash.js | 2 +- js/ui/dnd.js | 2 +- js/ui/overview.js | 2 +- js/ui/workspacesView.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/ui/dash.js b/js/ui/dash.js index 10f1408fa..2b3d080d0 100644 --- a/js/ui/dash.js +++ b/js/ui/dash.js @@ -324,7 +324,7 @@ Dash.prototype = { this._favRemoveTarget = null; })); } - DND.removeMonitor(this._dragMonitor); + DND.removeDragMonitor(this._dragMonitor); }, _onDragMotion: function(dragEvent) { diff --git a/js/ui/dnd.js b/js/ui/dnd.js index 46440d6ff..33f150147 100644 --- a/js/ui/dnd.js +++ b/js/ui/dnd.js @@ -61,7 +61,7 @@ function addDragMonitor(monitor) { dragMonitors.push(monitor); } -function removeMonitor(monitor) { +function removeDragMonitor(monitor) { for (let i = 0; i < dragMonitors.length; i++) if (dragMonitors[i] == monitor) { dragMonitors.splice(i, 1); diff --git a/js/ui/overview.js b/js/ui/overview.js index ec6762544..420ce3f58 100644 --- a/js/ui/overview.js +++ b/js/ui/overview.js @@ -220,7 +220,7 @@ Overview.prototype = { } this._resetWindowSwitchTimeout(); this._lastHoveredWindow = null; - DND.removeMonitor(this._dragMonitor); + DND.removeDragMonitor(this._dragMonitor); this.endItemDrag(); }, diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js index 4a37b2949..d6012795c 100644 --- a/js/ui/workspacesView.js +++ b/js/ui/workspacesView.js @@ -449,7 +449,7 @@ WorkspacesView.prototype = { Mainloop.source_remove(this._timeoutId); this._timeoutId = 0; } - DND.removeMonitor(this._dragMonitor); + DND.removeDragMonitor(this._dragMonitor); this._inDrag = false; for (let i = 0; i < this._workspaces.length; i++)