From 1a7ea52394792da7b2c69613aa1eb010ef5f70e6 Mon Sep 17 00:00:00 2001
From: "leaf%mozilla.org"
 <leaf%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 10 Feb 2000 04:23:06 +0000
Subject: [PATCH] checking in updates to fix xmlterm build (not part of regular
 build yet)

git-svn-id: svn://10.0.0.236/trunk@60277 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/xmlterm/base/mozLineTerm.cpp     | 7 ++++++-
 mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp | 5 ++++-
 mozilla/extensions/xmlterm/geckoterm/Makefile.in    | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mozilla/extensions/xmlterm/base/mozLineTerm.cpp b/mozilla/extensions/xmlterm/base/mozLineTerm.cpp
index 7ffb22efac1..dce65757f96 100644
--- a/mozilla/extensions/xmlterm/base/mozLineTerm.cpp
+++ b/mozilla/extensions/xmlterm/base/mozLineTerm.cpp
@@ -235,6 +235,8 @@ NS_IMETHODIMP mozLineTerm::GetSecurePrincipal(nsIDOMDocument *domDoc,
 {
   XMLT_LOG(mozLineTerm::GetSecurePrincipal,30,("\n"));
 
+  nsresult result;
+
   if (!aPrincipalStr)
     return NS_ERROR_FAILURE;
 
@@ -245,7 +247,10 @@ NS_IMETHODIMP mozLineTerm::GetSecurePrincipal(nsIDOMDocument *domDoc,
   if (!doc)
     return NS_ERROR_FAILURE;
 
-  nsCOMPtr<nsIPrincipal> principal=dont_AddRef(doc->GetDocumentPrincipal());
+  nsCOMPtr<nsIPrincipal> principal;
+  result = doc->GetPrincipal(getter_AddRefs(principal));
+  if (NS_FAILED(result)) 
+    return result;
 
 #if 0  // Temporarily comented out, because ToString is not immplemented
   result = principal->ToString(aPrincipalStr);
diff --git a/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp b/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp
index 4574e2ce031..bca3390d9f3 100644
--- a/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp
+++ b/mozilla/extensions/xmlterm/base/mozXMLTermUtils.cpp
@@ -337,7 +337,10 @@ mozXMLTermUtils::ExecuteScript(nsIDOMDocument* aDOMDocument,
   if (!doc)
     return NS_ERROR_FAILURE;
 
-  nsCOMPtr<nsIPrincipal> docPrincipal=dont_AddRef(doc->GetDocumentPrincipal());
+  nsCOMPtr<nsIPrincipal> docPrincipal;
+  result =  doc->GetPrincipal(getter_AddRefs(docPrincipal));
+  if (NS_FAILED(result)) 
+    return result;
 
   // Get document script context
   nsCOMPtr<nsIScriptContext> scriptContext;
diff --git a/mozilla/extensions/xmlterm/geckoterm/Makefile.in b/mozilla/extensions/xmlterm/geckoterm/Makefile.in
index 5da3a10cdf9..64cacd24c69 100644
--- a/mozilla/extensions/xmlterm/geckoterm/Makefile.in
+++ b/mozilla/extensions/xmlterm/geckoterm/Makefile.in
@@ -62,7 +62,7 @@ DEFINES = $(TK_CFLAGS)
 CPPSRCS = nsSetupRegistry.cpp  \
 	mozSimpleContainer.cpp \
 	mozGeckoTerm.cpp       \
-	nsTimer.cpp            \
+#	nsTimer.cpp            \
 	$(NULL)
 
 # Libraries to be linked