Bug 1456767 - Update prefs to use thunderbird.net in place of mozillamessaging.com and mozilla.org. r=jorgk a=jorgk
authorAndrei Hajdukewycz <sancus@pobox.com>
Wed, 25 Apr 2018 02:08:01 -0700
changeset 31433 dd9b7417eca94f24ca1bea33aab4c1f49b544402
parent 31432 d7782f98d9c7249e0de2dbbad00185dd7004ae8f
child 31434 a6ee70f976e2ba4e65dd56e9df513faae73011fb
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersjorgk, jorgk
bugs1456767
Bug 1456767 - Update prefs to use thunderbird.net in place of mozillamessaging.com and mozilla.org. r=jorgk a=jorgk
mail/app/profile/all-thunderbird.js
mail/branding/nightly/branding.nsi
mail/branding/nightly/thunderbird-branding.js
mail/branding/thunderbird/branding.nsi
mail/branding/thunderbird/thunderbird-branding.js
mail/installer/windows/nsis/installer.nsi
mailnews/mailnews.js
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -90,40 +90,40 @@ pref("app.update.silent", false);
 // when it finishes downloading them. Disabled in bug 1397862.
 pref("app.update.staging.enabled", false);
 
 // Update service URL:
 pref("app.update.url", "https://aus5.mozilla.org/update/6/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
 
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
-pref("app.update.url.manual", "http://www.getthunderbird.com");
+pref("app.update.url.manual", "https://www.thunderbird.net");
 // 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", "https://www.mozilla.org/%LOCALE%/%APP%/releases/");
+pref("app.update.url.details", "https://www.thunderbird.net/%LOCALE%/%APP%/releases/");
 
 // 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 to attempt using the service for updates.
 #ifdef MOZ_MAINTENANCE_SERVICE
 pref("app.update.service.enabled", true);
 #endif
 
 // Release notes URL
-pref("app.releaseNotesURL", "https://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+pref("app.releaseNotesURL", "https://live.thunderbird.net/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // URL for "Learn More" for Crash Reporter.
 pref("toolkit.crashreporter.infoURL",
      "https://www.mozilla.org/thunderbird/legal/privacy/#crash-reporter");
 
 // Base URL for web-based support pages.
-pref("app.support.baseURL", "https://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
+pref("app.support.baseURL", "https://support.thunderbird.net/%LOCALE%/%APP%/%APPBUILDID%/");
 
 // Show error messages in error console.
 pref("javascript.options.showInConsole", true);
 
 // Controls enabling of the extension system logging (can reduce performance)
 pref("extensions.logging.enabled", false);
 
 // Strict compatibility makes add-ons incompatible by default.
@@ -760,17 +760,17 @@ pref("plugins.hide_infobar_for_outdated_
 
 #ifdef XP_MACOSX
 pref("plugins.use_layers", false);
 pref("plugins.hide_infobar_for_carbon_failure_plugin", false);
 #endif
 
 pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/");
 pref("plugins.update.notifyUser", false);
-pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+pref("plugins.crash.supportUrl", "https://live.thunderbird.net/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
 
 // Click-to-play has not been ported for TB yet, see bug 814168.
 // The default plugin state should be changed to "ask to activate" when this
 // has been done.
 pref("plugins.click_to_play", false);
 // Disable by default.
 pref("plugin.default.state", 0);
 
@@ -790,18 +790,18 @@ pref("mail.taskbar.lists.tasks.enabled",
 // Disable hardware accelerated layers
 pref("layers.acceleration.disabled", true);
 #ifdef XP_WIN
 // and direct2d support on Windows.
 pref("gfx.direct2d.disabled", true);
 #endif
 
 // Account provisioner.
-pref("mail.provider.providerList", "https://broker-live.mozillamessaging.com/provider/list");
-pref("mail.provider.suggestFromName", "https://broker-live.mozillamessaging.com/provider/suggest");
+pref("mail.provider.providerList", "https://broker.thunderbird.net/provider/list");
+pref("mail.provider.suggestFromName", "https://broker.thunderbird.net/provider/suggest");
 pref("mail.provider.enabled", true);
 
 // Pointer to the default engine name.
 pref("browser.search.defaultenginename", "chrome://messenger-region/locale/region.properties");
 
 // Ordering of search engines in the engine list.
 pref("browser.search.order.1", "chrome://messenger-region/locale/region.properties");
 pref("browser.search.order.2", "chrome://messenger-region/locale/region.properties");
@@ -829,21 +829,21 @@ pref("mail.chat.notification_info", 0);
 pref("mail.chat.play_sound", true);
 // 0 == default system sound, 1 == user specified wav
 pref("mail.chat.play_sound.type", 0);
 // if sound is user specified, this needs to be a file url
 pref("mail.chat.play_sound.url", "");
 
 // BigFiles
 pref("mail.cloud_files.enabled", true);
-pref("mail.cloud_files.inserted_urls.footer.link", "http://www.getthunderbird.com");
-pref("mail.cloud_files.learn_more_url", "https://support.mozillamessaging.com/kb/filelink-large-attachments");
+pref("mail.cloud_files.inserted_urls.footer.link", "https://www.thunderbird.net");
+pref("mail.cloud_files.learn_more_url", "https://support.thunderbird.net/kb/filelink-large-attachments");
 
 // Ignore threads
-pref("mail.ignore_thread.learn_more_url", "https://support.mozillamessaging.com/kb/ignore-threads");
+pref("mail.ignore_thread.learn_more_url", "https://support.thunderbird.net/kb/ignore-threads");
 
 // Sanitize dialog window
 pref("privacy.cpd.history", true);
 pref("privacy.cpd.cookies", true);
 pref("privacy.cpd.cache", true);
 
 // What default should we use for the time span in the sanitizer:
 // 0 - Clear everything
--- a/mail/branding/nightly/branding.nsi
+++ b/mail/branding/nightly/branding.nsi
@@ -5,12 +5,12 @@
 # NSIS defines for nightly builds.
 # The release build branding.nsi is located in other-license/branding/thunderbird/
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Daily"
 !define BrandFullName         "Thunderbird Daily"
 !define CompanyName           "mozilla.org"
-!define URLInfoAbout          "http://www.mozilla.org/"
-!define URLUpdateInfo         "http://www.mozilla.org/products/thunderbird/"
-!define URLSystemRequirements "https://www.mozilla.org/thunderbird/system-requirements/"
-!define SurveyURL             "http://live.mozillamessaging.com/survey/uninstall/?locale=${AB_CD}&version=${AppVersion}"
+!define URLInfoAbout          "https://www.mozilla.org/"
+!define URLUpdateInfo         "https://www.thunderbird.net/"
+!define URLSystemRequirements "https://www.thunderbird.net/thunderbird/system-requirements/"
+!define SurveyURL             "https://live.thunderbird.net/survey/uninstall/?locale=${AB_CD}&version=${AppVersion}"
--- a/mail/branding/nightly/thunderbird-branding.js
+++ b/mail/branding/nightly/thunderbird-branding.js
@@ -1,22 +1,22 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Default start page
-pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+pref("mailnews.start_page.url","https://live.thunderbird.net/%APP%/start?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&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%");
+pref("mailnews.start_page.override_url","https://live.thunderbird.net/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&os=%OS%&buildid=%APPBUILDID%");
 
 // Interval: Time between checks for a new version (in seconds)
 // 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%/");
+pref("app.vendorURL", "https://www.thunderbird.net/%LOCALE%/");
--- a/mail/branding/thunderbird/branding.nsi
+++ b/mail/branding/thunderbird/branding.nsi
@@ -37,12 +37,12 @@
 # NSIS defines for official release builds.
 # The nightly build branding.nsi is located in mail/installer/windows/nsis
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Mozilla Thunderbird"
 !define BrandFullName         "Mozilla Thunderbird"
 !define CompanyName           "Mozilla Corporation"
-!define URLInfoAbout          "http://www.mozilla.org/${AB_CD}/"
-!define URLUpdateInfo         "http://www.mozilla.org/${AB_CD}/thunderbird/"
-!define URLSystemRequirements "https://www.mozilla.org/thunderbird/system-requirements/"
-!define SurveyURL             "http://live.mozillamessaging.com/survey/uninstall/?locale=${AB_CD}&version=${AppVersion}"
+!define URLInfoAbout          "https://www.mozilla.org/${AB_CD}/"
+!define URLUpdateInfo         "https://www.thunderbird.net/${AB_CD}/"
+!define URLSystemRequirements "https://www.thunderbird.net/thunderbird/system-requirements/"
+!define SurveyURL             "https://live.thunderbird.net/survey/uninstall/?locale=${AB_CD}&version=${AppVersion}"
--- a/mail/branding/thunderbird/thunderbird-branding.js
+++ b/mail/branding/thunderbird/thunderbird-branding.js
@@ -1,20 +1,20 @@
 // Default start page
-pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+pref("mailnews.start_page.url","https://live.thunderbird.net/%APP%/start?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&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%");
+pref("mailnews.start_page.override_url","https://live.thunderbird.net/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&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
 // 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.mozilla.org/%LOCALE%/%APP%/");
+pref("app.vendorURL", "https://www.thunderbird.net/%LOCALE%/");
 
 pref("browser.search.param.ms-pc", "MOZT");
--- a/mail/installer/windows/nsis/installer.nsi
+++ b/mail/installer/windows/nsis/installer.nsi
@@ -42,17 +42,17 @@ Var PreventRebootRequired
 ; an application's Start Menu PROGRAMS directory and doesn't define the
 ; StartMenuDir variable can use the common InstallOnInitCommon macro.
 !define NO_STARTMENU_DIR
 
 ; Attempt to elevate Standard Users in addition to users that
 ; are a member of the Administrators group.
 !define NONADMIN_ELEVATE
 
-!define AbortSurveyURL "http://live.mozillamessaging.com/survey/cancel/?page="
+!define AbortSurveyURL "https://live.thunderbird.net/survey/cancel/?page="
 
 ; Other included files may depend upon these includes!
 ; The following includes are provided by NSIS.
 !include FileFunc.nsh
 !include LogicLib.nsh
 !include MUI.nsh
 !include WinMessages.nsh
 !include WinVer.nsh
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -876,19 +876,19 @@ pref("mail.notification.count.inbox_only
 pref("dom.max_chrome_script_run_time", 0);
 #endif
 
 // For the Empty Junk/Trash confirmation dialogs.
 pref("mailnews.emptyJunk.dontAskAgain", false);
 pref("mailnews.emptyTrash.dontAskAgain", false);
 
 // where to fetch auto config information from.
-pref("mailnews.auto_config_url", "https://live.mozillamessaging.com/autoconfig/v1.1/");
+pref("mailnews.auto_config_url", "https://live.thunderbird.net/autoconfig/v1.1/");
 // Added in bug 551519. Remove when bug 545866 is fixed.
-pref("mailnews.mx_service_url", "https://live.mozillamessaging.com/dns/mx/");
+pref("mailnews.mx_service_url", "https://live.thunderbird.net/dns/mx/");
 // Allow to contact ISP (email address domain)
 // This happens via insecure means (HTTP), so the config cannot be trusted,
 // and also contains the email address
 pref("mailnews.auto_config.fetchFromISP.enabled", true);
 // Allow the fetch from ISP via HTTP, but not the email address
 pref("mailnews.auto_config.fetchFromISP.sendEmailAddress", true);
 pref("mailnews.auto_config.guess.enabled", true);