From 5e1cf62d7a6822df293b5b5b71e36bc11f65cb70 Mon Sep 17 00:00:00 2001
From: Jorg K <jorgk@jorgk.com>
Date: Wed, 21 Feb 2018 15:32:34 +0100
Subject: [PATCH] Bug 1439883 - Port Bug 1435671: NS_MutateURI::Apply() is no
 longer templated (take 2). r=aceman

---
 ldap/xpcom/src/nsLDAPURL.cpp       | 8 ++++----
 mailnews/compose/src/nsMsgSend.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ldap/xpcom/src/nsLDAPURL.cpp b/ldap/xpcom/src/nsLDAPURL.cpp
index 6ece762c46..335907dd94 100644
--- a/ldap/xpcom/src/nsLDAPURL.cpp
+++ b/ldap/xpcom/src/nsLDAPURL.cpp
@@ -38,10 +38,10 @@ nsLDAPURL::Init(uint32_t aUrlType, int32_t aDefaultPort,
 {
   nsresult rv;
   rv = NS_MutateURI(NS_STANDARDURLMUTATOR_CONTRACTID)
-         .Apply<nsIStandardURLMutator>(&nsIStandardURLMutator::Init,
-                                       nsIStandardURL::URLTYPE_STANDARD,
-                                       aDefaultPort, PromiseFlatCString(aSpec),
-                                       aOriginCharset, aBaseURI, nullptr)
+         .Apply(NS_MutatorMethod(&nsIStandardURLMutator::Init,
+                                 nsIStandardURL::URLTYPE_STANDARD,
+                                 aDefaultPort, PromiseFlatCString(aSpec),
+                                 aOriginCharset, aBaseURI, nullptr))
          .Finalize(mBaseURL);
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/mailnews/compose/src/nsMsgSend.cpp b/mailnews/compose/src/nsMsgSend.cpp
index 191e7555b4..1da8fec31c 100644
--- a/mailnews/compose/src/nsMsgSend.cpp
+++ b/mailnews/compose/src/nsMsgSend.cpp
@@ -2057,8 +2057,8 @@ nsMsgComposeAndSend::AddCompFieldLocalAttachments()
               nsCOMPtr<nsIURL> fileUrl;
               rv = NS_MutateURI(NS_STANDARDURLMUTATOR_CONTRACTID)
                      .Apply(NS_MutatorMethod(&nsIURLMutator::SetFileName,
-                                           m_attachments[newLoc]->m_realName,
-                                           nullptr))
+                                             m_attachments[newLoc]->m_realName,
+                                             nullptr))
                      .Finalize(fileUrl);
               if (NS_SUCCEEDED(rv))
               {