Bug 454073 - Fix regressions from bug 413260 related to |aimScreenName|; Bv1-TB; r=bugzilla sr=dmose
authorSerge Gautherie <sgautherie.bz@free.fr>
Fri, 12 Sep 2008 23:19:56 +0200
changeset 322 d67d548170ce08e408b06151a834868cd492446f
parent 321 63cb145ce16e62beb8dc786e155cf8a491090c22
child 323 b63a39af19cdcd28199a11dbdd3980becd823127
push idunknown
push userunknown
push dateunknown
reviewersbugzilla, dmose
bugs454073, 413260
Bug 454073 - Fix regressions from bug 413260 related to |aimScreenName|; Bv1-TB; r=bugzilla sr=dmose
mail/components/addrbook/content/abCardViewOverlay.js
mail/components/addrbook/content/addressbook.js
--- a/mail/components/addrbook/content/abCardViewOverlay.js
+++ b/mail/components/addrbook/content/abCardViewOverlay.js
@@ -248,17 +248,17 @@ function DisplayCardViewPane(realCard)
 
   data.cvAimPresence.removeAttribute("src");
   data.cvAimPresence.removeAttribute("url");
   data.cvAimPresence.setAttribute("width","0");
 
 #if 0
     // for now, disable the presence check since we don't really support this anymore but we may again in the future.
     // I'm leaving the code here for historical reference. See Bug #295726.
-    data.cvAimPresence.setAttribute("src","http://big.oscar.aol.com:80/" + card.aimScreenName + "?on_url=http://ncmail.netscape.com/include/nc/images/online.gif&off_url=http://ncmail.netscape.com/include/nc/images/offline.gif");
+    data.cvAimPresence.setAttribute("src","http://big.oscar.aol.com:80/" + card.getProperty("_AimScreenName") + "?on_url=http://ncmail.netscape.com/include/nc/images/online.gif&off_url=http://ncmail.netscape.com/include/nc/images/offline.gif");
     data.cvAimPresence.setAttribute("url", goimURL);
     data.cvAimPresence.setAttribute("width","16");
 #endif
 
    visible = hasScreenName || visible;
    visible = HandleLink(data.cvEmail2, zSecondaryEmail,
                         card.getProperty("SecondEmail"), data.cvEmail2Box,
                         "mailto:" + card.getProperty("SecondEmail")) || visible;
--- a/mail/components/addrbook/content/addressbook.js
+++ b/mail/components/addrbook/content/addressbook.js
@@ -643,17 +643,17 @@ function AbIMSelected()
 {
   var cards = GetSelectedAbCards();
   var count = cards.length;
 
   var screennames;
   var screennameCount = 0;
 
   for (var i=0;i<count;i++) {
-    var screenname = cards[i].aimScreenName;
+    var screenname = cards[i].getProperty("_AimScreenName", "");
     if (screenname) {
       if (screennameCount == 0)
         screennames = screenname;
       else
         screennames += "," + screenname;
 
       screennameCount++
     }