Bug 706798 - 'Tune' the time to wait before displaying the update been downloaded / restart notification. r+a=Standard8
authorIrving Reid <irving@mozilla.com>
Mon, 16 Jan 2012 15:13:38 -0500
changeset 10105 1bfd207d1339c3f5baa2b2cd72b152189d67a25a
parent 10104 e039f47e9b7333b96123ebf46ac1afd5f46f13d4
child 10106 df426b0ca04312d90354297ad4e483b9588066d0
push idunknown
push userunknown
push dateunknown
bugs706798
Bug 706798 - 'Tune' the time to wait before displaying the update been downloaded / restart notification. r+a=Standard8
mail/app/profile/all-thunderbird.js
mail/branding/aurora/thunderbird-branding.js
mail/branding/nightly/thunderbird-branding.js
other-licenses/branding/thunderbird/thunderbird-branding.js
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -101,24 +101,19 @@ pref("app.update.url", "https://aus2.moz
 // attempts fail.
 pref("app.update.url.manual", "http://www.getthunderbird.com");
 // A default value for the "More information about this update" link
 // supplied in the "An update is available" page of the update wizard. 
 pref("app.update.url.details", "http://www.mozillamessaging.com/%LOCALE%/%APP%/releases/");
 // User-settable override to app.update.url for testing purposes.
 //pref("app.update.url.override", "");
 
-// Interval: Time before prompting the user again to restart to install the
-//           latest download (in seconds) default=1 day
-pref("app.update.nagTimer.restart", 86400);
-// Interval: When all registered timers should be checked (in milliseconds)
-//           default=10 minutes
-pref("app.update.timer", 600000);
-// Give the user x seconds to react before showing the big UI. default=12 hrs
-pref("app.update.promptWaitTime", 43200);
+// app.update.interval is in branding section
+// app.update.promptWaitTime is in branding section
+
 // Show the Update Checking/Ready UI when the user was idle for x seconds
 pref("app.update.idletime", 60);
 
 // Whether or not we show a dialog box informing the user that the update was
 // successfully applied. This is off in Firefox by default since we show a 
 // upgrade start page instead! Other apps may wish to show this UI, and supply
 // a whatsNewURL field in their brand.properties that contains a link to a page
 // which tells users what's new in this new update.
--- a/mail/branding/aurora/thunderbird-branding.js
+++ b/mail/branding/aurora/thunderbird-branding.js
@@ -7,9 +7,12 @@ pref("mailnews.start_page.override_url",
 // 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
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 60);
 
+// Give the user x seconds to react before showing the big UI. default=24 hours
+pref("app.update.promptWaitTime", 86400);
+
 pref("app.vendorURL", "http://www.mozilla.org/projects/%APP%/");
--- a/mail/branding/nightly/thunderbird-branding.js
+++ b/mail/branding/nightly/thunderbird-branding.js
@@ -1,15 +1,18 @@
 // Default start page
 pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?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);
+// nightly=1 hour, official=24 hours
+pref("app.update.interval", 3600);
 
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 60);
 
+// Give the user x seconds to react before showing the big UI. nightly=1 hour
+pref("app.update.promptWaitTime", 3600);
+
 pref("app.vendorURL", "http://www.mozilla.org/projects/%APP%/");
--- a/other-licenses/branding/thunderbird/thunderbird-branding.js
+++ b/other-licenses/branding/thunderbird/thunderbird-branding.js
@@ -7,9 +7,12 @@ pref("mailnews.start_page.override_url",
 // 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
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 600);
 
+// Give the user x seconds to react before showing the big UI. default=24 hours
+pref("app.update.promptWaitTime", 86400);
+
 pref("app.vendorURL", "http://www.mozillamessaging.com/%LOCALE%/%APP%/");