checking in updates to fix xmlterm build (not part of regular build yet)

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);

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;

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