From eaaa70fa2ed8839e3baec751cab62df91c94ddea Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com"
 <blakeross%telocity.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 13 Oct 2002 17:32:15 +0000
Subject: [PATCH] Hook up customize toolbar callback after window shows; ifdef
 XP_UNIX out the xremote stuff (I'm anal).

git-svn-id: svn://10.0.0.236/trunk@131918 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 920988a63b9..4e1b67b71b6 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -259,9 +259,6 @@ function Startup()
 
   gProgressMeterPanel = document.getElementById("statusbar-progresspanel");
 
-  var toolbox = document.getElementById("navigator-toolbox");
-  toolbox.customizeDone = BrowserToolboxCustomizeDone;
-
   var webNavigation;
   try {
     // Create the browser instance component.
@@ -353,7 +350,7 @@ function Startup()
         loadURI(uriToLoad);
       }
     }
-
+#ifdef XP_UNIX
     // hook up remote support
     if (XREMOTESERVICE_CONTRACTID in Components.classes) {
       var remoteService;
@@ -364,7 +361,7 @@ function Startup()
       RegisterTabOpenObserver();
     }
   }
-  
+#endif  
   if (window.opener) {
     var openerSidebarBox = window.opener.document.getElementById("sidebar-box");
     if (!openerSidebarBox.hidden) {
@@ -426,6 +423,9 @@ function delayedStartup(aElt)
 
   SetPageProxyState("invalid", null);
 
+  var toolbox = document.getElementById("navigator-toolbox");
+  toolbox.customizeDone = BrowserToolboxCustomizeDone;
+
   // Get the preferences service
   gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
                               .getService(Components.interfaces.nsIPrefService);
@@ -453,6 +453,7 @@ function WindowFocusTimerCallback(element)
 
 function Shutdown()
 {
+#ifdef XP_UNIX
   // remove remote support
   if (XREMOTESERVICE_CONTRACTID in Components.classes) {
     var remoteService;
@@ -460,7 +461,7 @@ function Shutdown()
                               .getService(Components.interfaces.nsIXRemoteService);
     remoteService.removeBrowserInstance(window);
   }
-
+#endif
   try {
     gBrowser.removeProgressListener(window.XULBrowserWindow);
   } catch (ex) {