Backout changeset 9d0181083ebb (Bug 1152045) due to mozmill bustage, r=rkent, a=rkent, a=callek for a SeaMonkey CLOSED TREE
authorR Kent James <rkent@caspia.com>
Tue, 14 Apr 2015 23:12:52 -0700
changeset 25848 7cb2c130de12eee30928fbc69a88d47122cdc55d
parent 25847 493df50681a3e8f3fffd7a749bed3d4ca682da82
child 25849 2548998cee4273ac210a85ddebf577866ad8136c
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrkent, rkent, callek
bugs1152045
backs out9d0181083ebb5cc609d04d72acf5d81817b6e2c2
Backout changeset 9d0181083ebb (Bug 1152045) due to mozmill bustage, r=rkent, a=rkent, a=callek for a SeaMonkey CLOSED TREE
mail/components/compose/content/MsgComposeCommands.js
suite/mailnews/compose/MsgComposeCommands.js
--- a/mail/components/compose/content/MsgComposeCommands.js
+++ b/mail/components/compose/content/MsgComposeCommands.js
@@ -3210,21 +3210,18 @@ function FillIdentityList(menulist)
         menulist.menupopup.appendChild(separator);
       }
       accountHadSeparator = needSeparator;
     }
     firstAccountWithIdentities = false;
 
     for (let i = 0; i < identities.length; i++) {
       let identity = identities[i];
-      let address = MailServices.headerParser
-                                .makeMailboxObject(identity.fullName,
-                                                   identity.email).toString();
-      let item = menulist.appendItem(address,
-                                     address,
+      let item = menulist.appendItem(identity.identityName,
+                                     identity.identityName,
                                      account.incomingServer.prettyName);
       item.setAttribute("identitykey", identity.key);
       item.setAttribute("accountkey", account.key);
       if (i == 0) {
         // Mark the first identity as default.
         item.setAttribute("default", "true");
       }
     }
--- a/suite/mailnews/compose/MsgComposeCommands.js
+++ b/suite/mailnews/compose/MsgComposeCommands.js
@@ -1,16 +1,15 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource:///modules/folderUtils.jsm");
 Components.utils.import("resource:///modules/iteratorUtils.jsm");
-Components.utils.import("resource:///modules/mailServices.js");
 
 /**
  * interfaces
  */
 const nsIMsgCompDeliverMode = Components.interfaces.nsIMsgCompDeliverMode;
 const nsIMsgCompSendFormat = Components.interfaces.nsIMsgCompSendFormat;
 const nsIMsgCompConvertible = Components.interfaces.nsIMsgCompConvertible;
 const nsIMsgCompType = Components.interfaces.nsIMsgCompType;
@@ -1893,21 +1892,18 @@ function FillIdentityList(menulist)
                                          Components.interfaces.nsIMsgIdentity));
 
     if (identities.length == 0)
       continue;
 
     for (let i = 0; i < identities.length; i++)
     {
       let identity = identities[i];
-      let address = MailServices.headerParser
-                                .makeMailboxObject(identity.fullName,
-                                                   identity.email).toString();
-      let item = menulist.appendItem(address,
-                                     address,
+      let item = menulist.appendItem(identity.identityName,
+                                     identity.identityName,
                                      account.incomingServer.prettyName);
       item.setAttribute("identitykey", identity.key);
       item.setAttribute("accountkey", account.key);
       if (i == 0)
       {
         // Mark the first identity as default.
         item.setAttribute("default", "true");
       }