From f1c279765b207988ba96e3d9ff40a6590850414c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sat, 12 Feb 2011 00:01:59 +0100
Subject: [PATCH] dash: Remove show/hide functions

As Main.overview is now usable from the dash's constructor, move
the setup of signal connections there and remove the show/hide
methods which were used as workaround.

https://bugzilla.gnome.org/show_bug.cgi?id=642196
---
 js/ui/dash.js     | 25 ++++++++-----------------
 js/ui/overview.js |  2 --
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/js/ui/dash.js b/js/ui/dash.js
index aefa1494d..6a39edc48 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -278,24 +278,15 @@ Dash.prototype = {
         this._appSystem.connect('installed-changed', Lang.bind(this, this._queueRedisplay));
         AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._queueRedisplay));
         this._tracker.connect('app-state-changed', Lang.bind(this, this._queueRedisplay));
-    },
 
-    show: function() {
-        this._itemDragBeginId = Main.overview.connect('item-drag-begin',
-            Lang.bind(this, this._onDragBegin));
-        this._itemDragEndId = Main.overview.connect('item-drag-end',
-            Lang.bind(this, this._onDragEnd));
-        this._windowDragBeginId = Main.overview.connect('window-drag-begin',
-            Lang.bind(this, this._onDragBegin));
-        this._windowDragEndId = Main.overview.connect('window-drag-end',
-            Lang.bind(this, this._onDragEnd));
-    },
-
-    hide: function() {
-        Main.overview.disconnect(this._itemDragBeginId);
-        Main.overview.disconnect(this._itemDragEndId);
-        Main.overview.disconnect(this._windowDragBeginId);
-        Main.overview.disconnect(this._windowDragEndId);
+        Main.overview.connect('item-drag-begin',
+                              Lang.bind(this, this._onDragBegin));
+        Main.overview.connect('item-drag-end',
+                              Lang.bind(this, this._onDragEnd));
+        Main.overview.connect('window-drag-begin',
+                              Lang.bind(this, this._onDragBegin));
+        Main.overview.connect('window-drag-end',
+                              Lang.bind(this, this._onDragEnd));
     },
 
     _onDragBegin: function() {
diff --git a/js/ui/overview.js b/js/ui/overview.js
index 71c9bf6f8..2f6c6abdd 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -537,7 +537,6 @@ Overview.prototype = {
 
         this.viewSelector.show();
         this._workspacesDisplay.show();
-        this.dash.show();
 
         this.workspaces = this._workspacesDisplay.workspacesView;
         global.overlay_group.add_actor(this.workspaces.actor);
@@ -751,7 +750,6 @@ Overview.prototype = {
 
         this._workspacesDisplay.hide();
         this.viewSelector.hide();
-        this.dash.hide();
 
         this._desktopFade.hide();
         this._background.hide();