From 1bac2e91d8a0c22fdf668c1b97383bf3287bb5b8 Mon Sep 17 00:00:00 2001
From: "tbogard%aol.net" <tbogard%aol.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 12 Apr 2000 10:00:04 +0000
Subject: [PATCH] Put the GetInterface for the uriContentListener into an
 ifndef for DOCSHELL_LOAD so when DOCSHELL_LOADING is turned on, we get the
 right handler.

git-svn-id: svn://10.0.0.236/trunk@65691 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsWebShell.cpp | 4 ++++
 mozilla/webshell/src/nsWebShell.cpp  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 348e50ed3db..cf7f8af4538 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -118,6 +118,8 @@ static NS_DEFINE_CID(kCharsetConverterManagerCID,  NS_ICHARSETCONVERTERMANAGER_C
 //XXX for nsIPostData; this is wrong; we shouldn't see the nsIDocument type
 #include "nsIDocument.h"
 
+//#define DOCSHELL_LOAD 1
+
 #ifdef DEBUG
 #undef NOISY_LINKS
 #undef NOISY_WEBSHELL_LEAKS
@@ -686,12 +688,14 @@ nsWebShell::GetInterface(const nsIID &aIID, void** aInstancePtr)
       NS_ADDREF((nsISupports*)*aInstancePtr);
       return NS_OK;
       }
+#ifndef DOCSHELL_LOAD
    else if (aIID.Equals(NS_GET_IID(nsIURIContentListener)))
    {
       *aInstancePtr = NS_STATIC_CAST(nsIURIContentListener*, this);
       NS_ADDREF((nsISupports*)*aInstancePtr);
       return NS_OK;
    }
+#endif /* DOCSHELL_LOAD */
    else if(aIID.Equals(NS_GET_IID(nsIScriptGlobalObject)))
       {
       NS_ENSURE_SUCCESS(EnsureScriptEnvironment(), NS_ERROR_FAILURE);
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index 348e50ed3db..cf7f8af4538 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -118,6 +118,8 @@ static NS_DEFINE_CID(kCharsetConverterManagerCID,  NS_ICHARSETCONVERTERMANAGER_C
 //XXX for nsIPostData; this is wrong; we shouldn't see the nsIDocument type
 #include "nsIDocument.h"
 
+//#define DOCSHELL_LOAD 1
+
 #ifdef DEBUG
 #undef NOISY_LINKS
 #undef NOISY_WEBSHELL_LEAKS
@@ -686,12 +688,14 @@ nsWebShell::GetInterface(const nsIID &aIID, void** aInstancePtr)
       NS_ADDREF((nsISupports*)*aInstancePtr);
       return NS_OK;
       }
+#ifndef DOCSHELL_LOAD
    else if (aIID.Equals(NS_GET_IID(nsIURIContentListener)))
    {
       *aInstancePtr = NS_STATIC_CAST(nsIURIContentListener*, this);
       NS_ADDREF((nsISupports*)*aInstancePtr);
       return NS_OK;
    }
+#endif /* DOCSHELL_LOAD */
    else if(aIID.Equals(NS_GET_IID(nsIScriptGlobalObject)))
       {
       NS_ENSURE_SUCCESS(EnsureScriptEnvironment(), NS_ERROR_FAILURE);