From 57236a4b981049cb9417f6e6c747bae3fa98e680 Mon Sep 17 00:00:00 2001
From: "bryner%brianryner.com" <bryner%brianryner.com>
Date: Mon, 3 May 2004 22:43:55 +0000
Subject: [PATCH] fixing camino bustage

---
 camino/src/browser/BrowserWindowController.mm | 3 +--
 camino/src/browser/BrowserWrapper.mm          | 7 ++-----
 camino/src/embedding/CHBrowserView.mm         | 3 +--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm
index 9887f8f96b88..41a7030c04c4 100644
--- a/camino/src/browser/BrowserWindowController.mm
+++ b/camino/src/browser/BrowserWindowController.mm
@@ -1724,8 +1724,7 @@ static NSArray* sToolbarDefaults = nil;
   webBrizzle->GetContentDOMWindow(getter_AddRefs(domWindow));
   nsCOMPtr<nsPIDOMWindow> privateWindow = do_QueryInterface(domWindow);
   ENSURE_TRUE(privateWindow);
-  nsCOMPtr<nsIFocusController> controller;
-  privateWindow->GetRootFocusController(getter_AddRefs(controller));
+  nsIFocusController *controller = privateWindow->GetRootFocusController();
   ENSURE_TRUE(controller);
   nsCOMPtr<nsIDOMElement> focusedItem;
   controller->GetFocusedElement(getter_AddRefs(focusedItem));
diff --git a/camino/src/browser/BrowserWrapper.mm b/camino/src/browser/BrowserWrapper.mm
index caec32c3d135..e736c105733a 100644
--- a/camino/src/browser/BrowserWrapper.mm
+++ b/camino/src/browser/BrowserWrapper.mm
@@ -279,8 +279,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged";
     
     nsCOMPtr<nsIDOMWindow> contentWindow = getter_AddRefs([[self getBrowserView] getContentWindow]);
     nsCOMPtr<nsPIDOMWindow> piWindow(do_QueryInterface(contentWindow));
-    nsCOMPtr<nsIChromeEventHandler> chromeHandler;
-    piWindow->GetChromeEventHandler(getter_AddRefs(chromeHandler));
+    nsIChromeEventHandler *chromeHandler = piWIndow->GetChromeEventHandler();
     nsCOMPtr<nsIDOMEventReceiver> rec(do_QueryInterface(chromeHandler));
     if ( rec )
       rec->AddEventListenerByIID(clickListener, NS_GET_IID(nsIDOMMouseListener));
@@ -734,9 +733,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged";
   if (showBlocker) {
     nsCOMPtr<nsIDOMWindow> domWindow = getter_AddRefs([mBrowserView getContentWindow]);
     nsCOMPtr<nsPIDOMWindow> piWindow(do_QueryInterface(domWindow));
-    PRBool isUnrequested;
-    piWindow->IsLoadingOrRunningTimeout(&isUnrequested);
-    if (isUnrequested) {
+    if (piWindow->IsLoadingOrRunningTimeout()) {
       // A popup is being opened while the page is currently loading.  Offer to block the
       // popup.
       nsAlertController* controller = CHBrowserService::GetAlertController();
diff --git a/camino/src/embedding/CHBrowserView.mm b/camino/src/embedding/CHBrowserView.mm
index 5224cedecd8e..a654cce75db2 100644
--- a/camino/src/embedding/CHBrowserView.mm
+++ b/camino/src/embedding/CHBrowserView.mm
@@ -174,8 +174,7 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1";
     
     nsCOMPtr<nsIDOMWindow> contentWindow = getter_AddRefs([self getContentWindow]);
     nsCOMPtr<nsPIDOMWindow> piWindow(do_QueryInterface(contentWindow));
-    nsCOMPtr<nsIChromeEventHandler> chromeHandler;
-    piWindow->GetChromeEventHandler(getter_AddRefs(chromeHandler));
+    nsIChromeEventHandler *chromeHandler = piWindow->GetChromeEventHandler();
     nsCOMPtr<nsIDOMEventReceiver> rec(do_QueryInterface(chromeHandler));
     if ( rec )
       rec->AddEventListenerByIID(clickListener, NS_GET_IID(nsIDOMMouseListener));