From 2b9645b268facdce3b454eacd7d94b1ee24275ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 18 Sep 2014 22:02:45 +0100
Subject: [PATCH] Use MetaWindow.get_frame_rect()

get_outer_rect() has been deprecated for a while, use the new
function instead.
---
 js/ui/keyboard.js           | 2 +-
 js/ui/panel.js              | 2 +-
 js/ui/windowManager.js      | 2 +-
 js/ui/workspace.js          | 4 ++--
 js/ui/workspaceThumbnail.js | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index b3de70b9a..1855adc21 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -610,7 +610,7 @@ const Keyboard = new Lang.Class({
 
     _moveTemporarily: function () {
         let currentWindow = global.screen.get_display().focus_window;
-        let rect = currentWindow.get_outer_rect();
+        let rect = currentWindow.get_frame_rect();
 
         let newX = rect.x;
         let newY = 3 * this.actor.height / 2;
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 3c2ab6bef..05d43f96f 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -1019,7 +1019,7 @@ const Panel = new Lang.Class({
         if (!dragWindow)
             return Clutter.EVENT_PROPAGATE;
 
-        let rect = dragWindow.get_outer_rect();
+        let rect = dragWindow.get_frame_rect();
         let [stageX, stageY] = event.get_coords();
 
         let allowDrag = dragWindow.maximized_vertically &&
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index ac723a516..60ab30f7a 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -413,7 +413,7 @@ const TilePreview = new Lang.Class({
                                                    y: monitor.y,
                                                    width: monitor.width,
                                                    height: monitor.height });
-            let [, rect] = window.get_outer_rect().intersect(monitorRect);
+            let [, rect] = window.get_frame_rect().intersect(monitorRect);
             this.actor.set_size(rect.width, rect.height);
             this.actor.set_position(rect.x, rect.y);
             this.actor.opacity = 0;
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 07f1b3eb6..e9ab1676b 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -254,7 +254,7 @@ const WindowClone = new Lang.Class({
     },
 
     _computeBoundingBox: function() {
-        let rect = this.metaWindow.get_outer_rect();
+        let rect = this.metaWindow.get_frame_rect();
 
         this.actor.get_children().forEach(function (child) {
             let realWindow;
@@ -264,7 +264,7 @@ const WindowClone = new Lang.Class({
                 realWindow = child.source;
 
             let metaWindow = realWindow.meta_window;
-            rect = rect.union(metaWindow.get_outer_rect());
+            rect = rect.union(metaWindow.get_frame_rect());
         }, this);
 
         // Convert from a MetaRectangle to a native JS object
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index ea859c7be..3adc32711 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -161,14 +161,14 @@ const WindowClone = new Lang.Class({
 
     _updateDialogPosition: function(realDialog, cloneDialog) {
         let metaDialog = realDialog.meta_window;
-        let dialogRect = metaDialog.get_outer_rect();
-        let rect = this.metaWindow.get_outer_rect();
+        let dialogRect = metaDialog.get_frame_rect();
+        let rect = this.metaWindow.get_frame_rect();
 
         cloneDialog.set_position(dialogRect.x - rect.x, dialogRect.y - rect.y);
     },
 
     _onPositionChanged: function() {
-        let rect = this.metaWindow.get_outer_rect();
+        let rect = this.metaWindow.get_frame_rect();
         this.actor.set_position(this.realWindow.x, this.realWindow.y);
     },