Bug 746320 - Redirect what's new page for Thunderbird 12; r+ui-review=bwinton,a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 20 Apr 2012 10:09:46 +0100
changeset 10755 377f41cdbd2c0ed972e2ebb3870432b3a118e2c6
parent 10747 33ee8cf6630f1facd84fb644ef50228c229ffd4e
child 10756 50a0ccf120cdadae9ea74627c3a83b4af4b89878
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs746320
Bug 746320 - Redirect what's new page for Thunderbird 12; r+ui-review=bwinton,a=Standard8
mail/base/content/specialTabs.js
mail/base/content/utilityOverlay.js
--- a/mail/base/content/specialTabs.js
+++ b/mail/base/content/specialTabs.js
@@ -524,23 +524,25 @@ var specialTabs = {
     let tabmail = document.getElementById('tabmail');
 
     var prefs = Components.classes["@mozilla.org/preferences-service;1"]
                           .getService(Components.interfaces.nsIPrefBranch);
 
     tabmail.registerTabType(this.contentTabType);
     tabmail.registerTabType(this.chromeTabType);
 
+    // Even though we're not doing this for TB 12, we still want to upgrade the prefs.
     // If we've upgraded:
     let [fromVer, toVer] = this.getApplicationUpgradeVersions(prefs);
 
     // Only show what's new tab if this is actually an upgraded version,
     // not just a new installation/profile.
-    if (fromVer && ((fromVer[0] != toVer[0]) || (fromVer[1] != toVer[1])))
-      this.showWhatsNewPage();
+    // Not for TB 12.
+    //if (fromVer && ((fromVer[0] != toVer[0]) || (fromVer[1] != toVer[1])))
+    //  this.showWhatsNewPage();
 
     // Show the about rights notification if we need to.
     if (this.shouldShowAboutRightsNotification(prefs))
       this.showAboutRightsNotification(prefs);
     else if (this.shouldShowTelemetryNotification(prefs))
       this.showTelemetryNotification(prefs);
   },
 
--- a/mail/base/content/utilityOverlay.js
+++ b/mail/base/content/utilityOverlay.js
@@ -221,22 +221,26 @@ function togglePaneSplitter(splitterId)
 function openUILink(url, event)
 {
   if (!event.button)
     messenger.launchExternalURL(url);
 }
 
 function openWhatsNew()
 {
+  // For TB 12, we are just using the release notes url.
+  openFormattedURL('app.releaseNotesURL');
+  /*
   let startpage =
     Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
               .getService(Components.interfaces.nsIURLFormatter)
               .formatURLPref("mailnews.start_page.override_url");
 
   openContentTab(startpage);
+  */
 }
 
 /**
  * Open the specified tab type (possibly in a new window)
  *
  * @param tabType the tab type to open (e.g. "contentTab")
  * @param tabParams the parameters to pass to the tab
  * @param where 'tab' to open in a new tab (default) or 'window' to open in a