From 328d0f23b16ada1d2f8557994e6bfb3a128b080f Mon Sep 17 00:00:00 2001
From: "aaronr%us.ibm.com"
 <aaronr%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Feb 2008 18:09:37 +0000
Subject: [PATCH] NPOTDB webservices build broken. Bug 417312, r=doronr

git-svn-id: svn://10.0.0.236/trunk@245721 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/webservices/proxy/src/wspexception.cpp | 4 ++--
 mozilla/extensions/webservices/public/nsISOAPMessage.idl  | 2 +-
 .../webservices/soap/src/nsHTTPSOAPTransport.cpp          | 8 ++++----
 mozilla/extensions/webservices/soap/src/nsSOAPCall.cpp    | 2 +-
 mozilla/extensions/webservices/soap/src/nsSOAPMessage.cpp | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mozilla/extensions/webservices/proxy/src/wspexception.cpp b/mozilla/extensions/webservices/proxy/src/wspexception.cpp
index 013f52d2887..d4b466604c2 100644
--- a/mozilla/extensions/webservices/proxy/src/wspexception.cpp
+++ b/mozilla/extensions/webservices/proxy/src/wspexception.cpp
@@ -65,7 +65,7 @@ NS_IMPL_ISUPPORTS1_CI(WSPException, nsIException)
 
 /* readonly attribute string message; */
 NS_IMETHODIMP
-WSPException::GetMessage(char * *aMessage)
+WSPException::GetMessageMoz(char * *aMessage)
 {
   NS_ENSURE_ARG_POINTER(aMessage);
 
@@ -178,6 +178,6 @@ WSPException::ToString(char **_retval)
     return GetName(_retval);
   }
   // else
-  return GetMessage(_retval);
+  return GetMessageMoz(_retval);
 }
 
diff --git a/mozilla/extensions/webservices/public/nsISOAPMessage.idl b/mozilla/extensions/webservices/public/nsISOAPMessage.idl
index fb948681521..3b0695d18d7 100644
--- a/mozilla/extensions/webservices/public/nsISOAPMessage.idl
+++ b/mozilla/extensions/webservices/public/nsISOAPMessage.idl
@@ -76,7 +76,7 @@ interface nsISOAPMessage : nsISupports {
    * may also use this accessor to get the document to avoid using 
    * decoders.
    */
-  attribute nsIDOMDocument message;
+  [binaryname(MessageMoz)] attribute nsIDOMDocument message;
 
   /**
    * A convenience attribute to obtain the DOM element representing the
diff --git a/mozilla/extensions/webservices/soap/src/nsHTTPSOAPTransport.cpp b/mozilla/extensions/webservices/soap/src/nsHTTPSOAPTransport.cpp
index a65ff6058fa..49dd501a250 100644
--- a/mozilla/extensions/webservices/soap/src/nsHTTPSOAPTransport.cpp
+++ b/mozilla/extensions/webservices/soap/src/nsHTTPSOAPTransport.cpp
@@ -380,7 +380,7 @@ nsHTTPSOAPTransport::SyncCall(nsISOAPCall * aCall, nsISOAPResponse * aResponse)
   NS_ENSURE_ARG(aCall);
 
   nsCOMPtr<nsIDOMDocument> messageDocument;
-  nsresult rv = aCall->GetMessage(getter_AddRefs(messageDocument));
+  nsresult rv = aCall->GetMessageMoz(getter_AddRefs(messageDocument));
   if (NS_FAILED(rv))
     return rv;
   if (!messageDocument)
@@ -423,7 +423,7 @@ nsHTTPSOAPTransport::SyncCall(nsISOAPCall * aCall, nsISOAPResponse * aResponse)
       return rv;
     if (response) {
     DEBUG_DUMP_DOCUMENT("Asynchronous Response", response)}
-    rv = aResponse->SetMessage(response);
+    rv = aResponse->SetMessageMoz(response);
     if (NS_FAILED(rv))
       return rv;
   }
@@ -518,7 +518,7 @@ NS_IMETHODIMP
       nsCOMPtr<nsIDOMDocument> document;
       rv = mRequest->GetResponseXML(getter_AddRefs(document));
       if (NS_SUCCEEDED(rv) && document) {
-        rv = mResponse->SetMessage(document);
+        rv = mResponse->SetMessageMoz(document);
         ChangePrincipal(document);
         DEBUG_DUMP_DOCUMENT("Asynchronous Response", document)
       } 
@@ -548,7 +548,7 @@ nsHTTPSOAPTransport::AsyncCall(nsISOAPCall * aCall,
 
 
   nsCOMPtr<nsIDOMDocument> messageDocument;
-  nsresult rv = aCall->GetMessage(getter_AddRefs(messageDocument));
+  nsresult rv = aCall->GetMessageMoz(getter_AddRefs(messageDocument));
   if (NS_FAILED(rv))
     return rv;
   if (!messageDocument)
diff --git a/mozilla/extensions/webservices/soap/src/nsSOAPCall.cpp b/mozilla/extensions/webservices/soap/src/nsSOAPCall.cpp
index df9a51b9d4e..e7f1e109afd 100644
--- a/mozilla/extensions/webservices/soap/src/nsSOAPCall.cpp
+++ b/mozilla/extensions/webservices/soap/src/nsSOAPCall.cpp
@@ -143,7 +143,7 @@ NS_IMETHODIMP nsSOAPCall::Invoke(nsISOAPResponse ** _retval)
     return rv;
 
   nsCOMPtr<nsIDOMDocument> document;
-  rv = response->GetMessage(getter_AddRefs(document));        //  No XML response.
+  rv = response->GetMessageMoz(getter_AddRefs(document));   //  No XML response.
   if (NS_FAILED(rv))
     return rv;
   if (!document) {
diff --git a/mozilla/extensions/webservices/soap/src/nsSOAPMessage.cpp b/mozilla/extensions/webservices/soap/src/nsSOAPMessage.cpp
index c3d1d0a907d..0c8d8a1f367 100644
--- a/mozilla/extensions/webservices/soap/src/nsSOAPMessage.cpp
+++ b/mozilla/extensions/webservices/soap/src/nsSOAPMessage.cpp
@@ -73,7 +73,7 @@ NS_IMETHODIMP nsSOAPMessage::GetMessageMoz(nsIDOMDocument * *aMessage)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsSOAPMessage::SetMessage(nsIDOMDocument * aMessage)
+NS_IMETHODIMP nsSOAPMessage::SetMessageMoz(nsIDOMDocument * aMessage)
 {
   mMessage = aMessage;
   return NS_OK;