gnome-shell r41 - trunk/js/ui

[otaylor svn gnome org]

Author: otaylor
Date: Sun Nov  9 18:01:59 2008
New Revision: 41
URL: http://svn.gnome.org/viewvc/gnome-shell?rev=41&view=rev

Log:
Remove workarounds for mutual imports problems

Now that gjs Bug #558741 is fixed, we can import Main directly from
the toplevel of overlay.js/panel.js without causing problems.

Modified:
   trunk/js/ui/overlay.js
   trunk/js/ui/panel.js

Modified: trunk/js/ui/overlay.js
==============================================================================
--- trunk/js/ui/overlay.js	(original)
+++ trunk/js/ui/overlay.js	Sun Nov  9 18:01:59 2008
@@ -5,6 +5,7 @@
 const Shell = imports.gi.Shell;
 const Tweener = imports.tweener.tweener;
 
+const Main = imports.ui.main;
 const Panel = imports.ui.panel;
 
 const OVERLAY_BACKGROUND_COLOR = new Clutter.Color();
@@ -228,7 +229,6 @@
     },
 
     _deactivate : function() {
-	let Main = imports.ui.main;
 	Main.hide_overlay();
     }
 };

Modified: trunk/js/ui/panel.js
==============================================================================
--- trunk/js/ui/panel.js	(original)
+++ trunk/js/ui/panel.js	Sun Nov  9 18:01:59 2008
@@ -5,10 +5,7 @@
 const Shell = imports.gi.Shell;
 const Clutter = imports.gi.Clutter;
 
-// The mutual import here causes things to break in weird ways,
-//  (http://bugzilla.gnome.org/show_bug.cgi?id=558741)
-// So we do a local import below
-// const Main = imports.ui.main;
+const Main = imports.ui.main;
 
 const PANEL_HEIGHT = 32;
 const PANEL_BACKGROUND_COLOR = new Clutter.Color();
@@ -46,9 +43,6 @@
 
 	message.connect('button-press-event',
 	    function(o, event) {
-		// See comment above
-	        let Main = imports.ui.main;
-
 		if (Main.overlay.visible)
 		    Main.hide_overlay();
 		else