Follow up to bug 309068. Make the new pref on trunk match what actually got released on branch. r/sr=neil.parkwaycc.co.uk

mailnews/addrbook/resources/content/abCardViewOverlay.js

@@ -231,7 +231,7 @@ function DisplayCardViewPane(card)
     visible = HandleLink(data.cvEmail1, zPrimaryEmail, card.primaryEmail, data.cvEmail1Box, "mailto:" + card.primaryEmail) || visible;
   }
 
-  var onlineCheckAllowed = gPrefs.getBoolPref("mail.addr_book.im.online_check_allowed");
+  var onlineCheckAllowed = gPrefs.getBoolPref("mail.addr_book.im.onlineCheckAllowed");
   var goimURL = "aim:goim?screenname=" + card.aimScreenName;
   var hasScreenName = HandleLink(data.cvScreenname, zScreenName, card.aimScreenName, data.cvScreennameBox, goimURL);
 

mailnews/addrbook/resources/content/addressbook.js

@@ -59,7 +59,7 @@ const kLastNameFirst = 1;
 const kFirstNameFirst = 2;
 const kLDAPDirectory = 0; // defined in nsDirPrefs.h
 const kPABDirectory  = 2; // defined in nsDirPrefs.h
-const kPrefOnlineCheckAllowed = "mail.addr_book.im.online_check_allowed";
+const kPrefOnlineCheckAllowed = "mail.addr_book.im.onlineCheckAllowed";
 
 // Note: We need to keep this listener as it does not just handle dir
 // pane deletes but also deletes of address books and lists from places like

mailnews/mailnews.js

@@ -137,7 +137,9 @@ pref("mail.file_attach_binary",             false);
 pref("mail.show_headers",                   1); // some
 pref("mail.pane_config",                    0);
 pref("mail.addr_book.mapit_url.format", "chrome://messenger-region/locale/region.properties");
-pref("mail.addr_book.im.online_check_allowed", false);
+#ifdef MOZ_SUITE
+pref("mail.addr_book.im.onlineCheckAllowed", false);
+#endif
 
 // the format for "mail.addr_book.quicksearchquery.format" is:
 // @V == the escaped value typed in the quick search bar in the addressbook