From 825bc96e675860a5d92e65fedd112480fbbe6496 Mon Sep 17 00:00:00 2001
From: "edburns%acm.org" <edburns%acm.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 28 Sep 2000 21:37:25 +0000
Subject: [PATCH] bug=52883 author=ashuk r,a=edburns

Make webclient work with the tip.


git-svn-id: svn://10.0.0.236/trunk@80080 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../java/webclient/src_moz/CBrowserContainer.cpp    | 13 +++----------
 mozilla/java/webclient/src_moz/Makefile.win         |  3 ---
 mozilla/java/webclient/src_moz/nsActions.cpp        |  7 +++++--
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/mozilla/java/webclient/src_moz/CBrowserContainer.cpp b/mozilla/java/webclient/src_moz/CBrowserContainer.cpp
index 8ff5fa5e650..27dbaac117a 100644
--- a/mozilla/java/webclient/src_moz/CBrowserContainer.cpp
+++ b/mozilla/java/webclient/src_moz/CBrowserContainer.cpp
@@ -86,7 +86,7 @@ NS_IMPL_ADDREF(CBrowserContainer)
 NS_IMPL_RELEASE(CBrowserContainer)
 
 NS_INTERFACE_MAP_BEGIN(CBrowserContainer)
-  //  	NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebBrowserChrome)
+    NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebBrowserChrome)
 	NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
 	NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome)
 	NS_INTERFACE_MAP_ENTRY(nsIURIContentListener)
@@ -108,17 +108,11 @@ NS_INTERFACE_MAP_END
 
 NS_IMETHODIMP CBrowserContainer::GetInterface(const nsIID & uuid, void * *result)
 {
-	const nsIID &iid = NS_GET_IID(nsIPrompt);
-	if (memcmp(&uuid, &iid, sizeof(nsIID)) == 0)
-	{
-		*result = (nsIPrompt *) this;
-		AddRef();
-		return NS_OK;
-	}
-    return NS_ERROR_FAILURE;
+    return QueryInterface(uuid, result);
 }
 
 
+
 ///////////////////////////////////////////////////////////////////////////////
 // nsIPrompt
 
@@ -1384,4 +1378,3 @@ nsresult JNICALL CBrowserContainer::takeActionOnNode(nsCOMPtr<nsIDOMNode> curren
 // Local functions
 //
 
-
diff --git a/mozilla/java/webclient/src_moz/Makefile.win b/mozilla/java/webclient/src_moz/Makefile.win
index 5a8f934b590..a4e1b8e2ec2 100644
--- a/mozilla/java/webclient/src_moz/Makefile.win
+++ b/mozilla/java/webclient/src_moz/Makefile.win
@@ -145,6 +145,3 @@ clobber::
 	rm -f nsSetupRegistry.cpp
 	rm -f runem.bat
 
-
-edburns:
-	echo $(LLIBS)
diff --git a/mozilla/java/webclient/src_moz/nsActions.cpp b/mozilla/java/webclient/src_moz/nsActions.cpp
index 50463a1aa5b..00ba87c80ba 100644
--- a/mozilla/java/webclient/src_moz/nsActions.cpp
+++ b/mozilla/java/webclient/src_moz/nsActions.cpp
@@ -38,9 +38,12 @@
 #include "nsISHEntry.h"
 #include "nsIURI.h"
 #include "nsIDocShellTreeItem.h"
+#include "nsIWebNavigation.h"
 
 #include "ns_util.h"
 
+#include "nsEmbedAPI.h"  // for NS_TermEmbedding
+
 void *          handleEvent     (PLEvent * event);
 void            destroyEvent    (PLEvent * event);
 
@@ -135,7 +138,7 @@ void *
 wsLoadURLEvent::handleEvent ()
 {
   if (mWebNavigation && mURL) {
-    nsresult rv = mWebNavigation->LoadURI(mURL->GetUnicode());
+      nsresult rv = mWebNavigation->LoadURI(mURL->GetUnicode(), nsIWebNavigation::LOAD_FLAGS_NONE);
   }
   return nsnull;
 } // handleEvent()
@@ -743,7 +746,7 @@ wsDeallocateInitContextEvent::handleEvent ()
     util_DeallocateShareInitContext(&(mInitContext->shareContext));
 
     //  delete mInitContext;
-        
+    NS_TermEmbedding();
     return (void *) NS_OK;
 } // handleEvent()