Bug 1557829 - Follow-up: Address review comments. r=me
authorJorg K <jorgk@jorgk.com>
Wed, 12 Jun 2019 09:05:25 +0200
changeset 35836 285cab894a6e7dfee527416a7f98307564f67af9
parent 35835 9400a58105984dd20dc914e32b9494b74e365d53
child 35837 f7a7d54671d68475cc8541e909b9143a5cc7c1e7
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersme
bugs1557829
Bug 1557829 - Follow-up: Address review comments. r=me
mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
mailnews/addrbook/src/nsAbView.cpp
mailnews/extensions/smime/src/nsMsgComposeSecure.h
--- a/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
@@ -114,20 +114,16 @@ NS_IMETHODIMP nsAbLDAPListenerBase::OnLD
     if (NS_FAILED(rv)) {
       NS_ERROR(
           "nsAbLDAPListenerBase::OnLDAPInit(): error getting ascii host"
           "name from directory url");
       InitFailed();
       return rv;
     }
 
-    // hostTemp is only necessary to work around a code-generation
-    // bug in egcs 1.1.2 (the version of gcc that comes with Red Hat 6.2),
-    // which is the default compiler for Mozilla on linux at the moment.
-    //
     AutoTArray<nsString, 1> hostArray;
     CopyASCIItoUTF16(host, *hostArray.AppendElement());
 
     // format the hostname into the authprompt text string
     //
     nsString authPromptText;
     rv = ldapBundle->FormatStringFromName("authPromptText", hostArray,
                                           authPromptText);
--- a/mailnews/addrbook/src/nsAbView.cpp
+++ b/mailnews/addrbook/src/nsAbView.cpp
@@ -1249,18 +1249,18 @@ NS_IMETHODIMP nsAbView::SwapFirstNameLas
 
             // Generate both ln/fn and fn/ln combination since we need both
             // later to check to see if the current display name was edited note
             // that fn/ln still hold the values before the swap
             nameString[0] = ln;
             nameString[1] = fn;
             rv = bundle->FormatStringFromName(formatString, nameString, dnLnFn);
             NS_ENSURE_SUCCESS(rv, rv);
-            nameString[0] = fn.get();
-            nameString[1] = ln.get();
+            nameString[0] = fn;
+            nameString[1] = ln;
             rv = bundle->FormatStringFromName(formatString, nameString, dnFnLn);
             NS_ENSURE_SUCCESS(rv, rv);
 
             // Get the current display name
             nsAutoString dn;
             rv = abCard->GetDisplayName(dn);
             NS_ENSURE_SUCCESS(rv, rv);
 
--- a/mailnews/extensions/smime/src/nsMsgComposeSecure.h
+++ b/mailnews/extensions/smime/src/nsMsgComposeSecure.h
@@ -52,17 +52,17 @@ class nsMsgComposeSecure : public nsIMsg
   nsresult MimeInitEncryption(bool aSign, nsIMsgSendReport *sendReport);
   nsresult MimeFinishMultipartSigned(bool aOuter, nsIMsgSendReport *sendReport);
   nsresult MimeFinishEncryption(bool aSign, nsIMsgSendReport *sendReport);
   nsresult MimeCryptoHackCerts(const char *aRecipients,
                                nsIMsgSendReport *sendReport, bool aEncrypt,
                                bool aSign, nsIMsgIdentity *aIdentity);
   bool InitializeSMIMEBundle();
   nsresult SMIMEBundleFormatStringFromName(const char *name,
-                                           nsTArray<nsString> &paramsparams,
+                                           nsTArray<nsString> &params,
                                            nsAString &outString);
   nsresult ExtractEncryptionState(nsIMsgIdentity *aIdentity,
                                   nsIMsgCompFields *aComposeFields,
                                   bool *aSignMessage, bool *aEncrypt);
 
   bool mSignMessage;
   bool mAlwaysEncryptMessage;
   mimeDeliveryCryptoState mCryptoState;