Bug 688169 - First Run message is never displayed. r=Standard8
authorIrving Reid <irving@mozilla.com>
Wed, 21 Sep 2011 11:51:40 -0400
changeset 8835 ad1f76cfcbcc4022373b78129ae685ee2f363a10
parent 8834 6ff6a3f0364ed19eff2841230ec30a6715ebace5
child 8836 9fa12b677b96af32705c70646afa5ce7fc871f17
push id177
push userbugzilla@standard8.plus.com
push dateTue, 27 Sep 2011 20:01:30 +0000
treeherdercomm-aurora@0a289bc5e5ea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs688169
Bug 688169 - First Run message is never displayed. r=Standard8
mail/base/content/mailWindow.js
mail/branding/aurora/thunderbird-branding.js
mail/branding/nightly/thunderbird-branding.js
other-licenses/branding/thunderbird/thunderbird-branding.js
--- a/mail/base/content/mailWindow.js
+++ b/mail/base/content/mailWindow.js
@@ -455,48 +455,29 @@ nsMsgWindowCommands.prototype =
     //  instance.  Strictly speaking, we don't want this.  I think davida's
     //  patch will change this, so we can figure it out after that lands if
     //  there are issues.
     ClearMessagePane();
   }
 }
 
 /**
- * @returns the pref name to use for fetching the start page url. Every time the application version changes,
- * return "mailnews.start_page.override_url". If this is the first time the application has been
- * launched, return "mailnews.start_page.welcome_url". Otherwise return "mailnews.start_page.url".
- */
-function startPageUrlPref()
-{
-  var prefForStartPageUrl = "mailnews.start_page.url";
-  var savedVersion = null;
-  try {
-    savedVersion = pref.getCharPref("mailnews.start_page_override.mstone");
-  } catch (ex) {}
-
-  if (!savedVersion && savedVersion != "ignore")
-    prefForStartPageUrl = "mailnews.start_page.welcome_url";
-
-  return prefForStartPageUrl;
-}
-
-/**
  * Loads the mail start page.
  */
 function loadStartPage(aForce)
 {
   // If the preference isn't enabled, then don't load anything.
   if (!aForce &&
       !Application.prefs.getValue("mailnews.start_page.enabled", false))
     return;
 
   gMessageNotificationBar.clearMsgNotifications();
   let startpage = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
                             .getService(Components.interfaces.nsIURLFormatter)
-                            .formatURLPref(startPageUrlPref());
+                            .formatURLPref("mailnews.start_page.url");
   if (startpage)
   {
     try {
       let urifixup = Components.classes["@mozilla.org/docshell/urifixup;1"]
                                .getService(Components.interfaces.nsIURIFixup);
 
       let uri = urifixup.createFixupURI(startpage, 0);
       GetMessagePaneFrame().location.href = uri.spec;
--- a/mail/branding/aurora/thunderbird-branding.js
+++ b/mail/branding/aurora/thunderbird-branding.js
@@ -1,14 +1,11 @@
 // Default start page
 pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
-// first launch welcome page
-pref("mailnews.start_page.welcome_url","https://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
-
 // start page override to load after an update
 pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // Interval: Time between checks for a new version (in seconds)
 // nightly=8 hours, official=24 hours
 pref("app.update.interval", 28800);
 
 // The time interval between the downloading of mar file chunks in the
--- a/mail/branding/nightly/thunderbird-branding.js
+++ b/mail/branding/nightly/thunderbird-branding.js
@@ -1,14 +1,11 @@
 // Default start page
 pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
-// first launch welcome page
-pref("mailnews.start_page.welcome_url","https://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
-
 // start page override to load after an update
 pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // Interval: Time between checks for a new version (in seconds)
 // nightly=8 hours, official=24 hours
 pref("app.update.interval", 28800);
 
 // The time interval between the downloading of mar file chunks in the
--- a/other-licenses/branding/thunderbird/thunderbird-branding.js
+++ b/other-licenses/branding/thunderbird/thunderbird-branding.js
@@ -1,14 +1,11 @@
 // Default start page
 pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
-// first launch welcome page
-pref("mailnews.start_page.welcome_url","https://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
-
 // start page override to load after an update
 pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // Interval: Time between checks for a new version (in seconds)
 // nightly=8 hours, official=24 hours
 pref("app.update.interval", 86400);
 
 // The time interval between the downloading of mar file chunks in the