From 23613f32c737c6ead60259ad79aae7a6458e5273 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Mon, 1 Aug 2011 15:45:40 +0200
Subject: [PATCH] Fix mentions of shell_global_get_primary_monitor()

This method has been removed, and replaced by Main.layoutManager.primaryMonitor

Patch sent by Miguel Aguilar <zodiac_es@yahoo.es>
---
 extensions/dock/extension.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/dock/extension.js b/extensions/dock/extension.js
index dfb67e08..acd90bb1 100644
--- a/extensions/dock/extension.js
+++ b/extensions/dock/extension.js
@@ -61,7 +61,7 @@ const DND_RAISE_APP_TIMEOUT = 500;
 /*************************************************************************************/
 function hideDock_size () {
     if (hideable){
-       let monitor = global.get_primary_monitor()
+       let monitor = Main.layoutManager.primaryMonitor
        let position_x = monitor.x;
        let height = (this._nicons)*(this._item_size + this._spacing) + 2*this._spacing;
        let width = this._item_size + 4*this._spacing;
@@ -90,7 +90,7 @@ function hideDock_size () {
 }
 
 function showDock_size () {
-     let monitor = global.get_primary_monitor();
+     let monitor = Main.layoutManager.primaryMonitor;
      let height = (this._nicons)*(this._item_size + this._spacing) + 2*this._spacing;
      let width = this._item_size + 4*this._spacing;
      let position_x = monitor.x;
@@ -123,7 +123,7 @@ function initShowDock_size () {
 }
 
 function showEffectAddItem_size () {
-        let primary = global.get_primary_monitor();
+        let primary = Main.layoutManager.primaryMonitor;
         let height = (this._nicons)*(this._item_size + this._spacing) + 2*this._spacing;
         let width = this._item_size + 4*this._spacing;
 
@@ -141,7 +141,7 @@ function showEffectAddItem_size () {
 /**************************************************************************************/
 function hideDock_scale () {
        this._item_size = dockicon_size;
-       let monitor = global.get_primary_monitor();
+       let monitor = Main.layoutManager.primaryMonitor;
        let cornerX = 0;
        let height = this._nicons*(this._item_size + this._spacing) + 2*this._spacing;
        let width = this._item_size + 4*this._spacing;
@@ -171,7 +171,7 @@ function hideDock_scale () {
 
 function showDock_scale () {
         this._item_size = dockicon_size;
-        let monitor = global.get_primary_monitor();
+        let monitor = Main.layoutManager.primaryMonitor;
         let position_x = monitor.x;
         let height = this._nicons*(this._item_size + this._spacing) + 2*this._spacing;
         let width = this._item_size + 4*this._spacing;
@@ -197,7 +197,7 @@ function showDock_scale () {
 }
 
 function initShowDock_scale () {
-        let primary = global.get_primary_monitor();
+        let primary = Main.layoutManager.primaryMonitor;
         let height = this._nicons*(this._item_size + this._spacing) + 2*this._spacing;
         let width = this._item_size + 4*this._spacing;
 
@@ -237,7 +237,7 @@ function initShowDock_scale () {
 }
 
 function showEffectAddItem_scale () {
-        let monitor = global.get_primary_monitor();
+        let monitor = Main.layoutManager.primaryMonitor;
         let height = this._nicons*(this._item_size + this._spacing) + 2*this._spacing;
         let width = this._item_size + 4*this._spacing;
 
@@ -308,7 +308,7 @@ Dock.prototype = {
 
         //hidden
         this._settings.connect('changed::'+DOCK_POSITION_KEY, Lang.bind(this, function (){
-                let primary = global.get_primary_monitor();
+                let primary = Main.layoutManager.primaryMonitor;
                 position = this._settings.get_enum(DOCK_POSITION_KEY);
                 this.actor.y=primary.y;
                 this._redisplay();