[MAIL] Add about:logopage as the mail start_url

7 files changed, 19 insertions, 14 deletions

diff --git a/mail/app/profile/all-thunderbird.js b/mail/app/profile/all-thunderbird.js
index 84c3e5166..98a163e33 100644
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -262,7 +262,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
 pref("mail.close_message_window.on_delete", false);
 
 // Disable the start page
-pref("mailnews.start_page.enabled", false);
+pref("mailnews.start_page.enabled", true);
 
 // Number of lines of To/CC/BCC address headers to show before "more"
 // truncates the list.
diff --git a/mail/base/jar.mn b/mail/base/jar.mn
index 1e1568cd3..a9bd9333d 100644
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -131,3 +131,4 @@ toolkit.jar:
 % overlay chrome://global/content/customizeToolbar.xul chrome://messenger/content/customizeToolbarOverlay.xul
 % overlay chrome://mozapps/content/downloads/downloads.xul chrome://messenger/content/downloadsOverlay.xul
 % overlay chrome://mozapps/content/extensions/extensions.xul chrome://messenger/content/extensionsOverlay.xul
+  content/global/logopage.xhtml                     (/mozilla/toolkit/content/logopage.xhtml)
\ No newline at end of file
diff --git a/mail/branding/unofficial/thunderbird-branding.js b/mail/branding/unofficial/thunderbird-branding.js
index 55cf79740..947c432a6 100644
--- a/mail/branding/unofficial/thunderbird-branding.js
+++ b/mail/branding/unofficial/thunderbird-branding.js
@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Default start page
-pref("mailnews.start_page.url","about:blank");
+pref("mailnews.start_page.url","about:logopage");
 
 // start page override to load after an update
-pref("mailnews.start_page.override_url","about:blank");
+pref("mailnews.start_page.override_url","about:logopage");
 
 // Interval: Time between checks for a new version (in seconds)
 // nightly=8 hours, official=24 hours
diff --git a/mail/branding/unstable/thunderbird-branding.js b/mail/branding/unstable/thunderbird-branding.js
index 55cf79740..947c432a6 100644
--- a/mail/branding/unstable/thunderbird-branding.js
+++ b/mail/branding/unstable/thunderbird-branding.js
@@ -3,10 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Default start page
-pref("mailnews.start_page.url","about:blank");
+pref("mailnews.start_page.url","about:logopage");
 
 // start page override to load after an update
-pref("mailnews.start_page.override_url","about:blank");
+pref("mailnews.start_page.override_url","about:logopage");
 
 // Interval: Time between checks for a new version (in seconds)
 // nightly=8 hours, official=24 hours
diff --git a/mail/components/mailComponents.manifest b/mail/components/mailComponents.manifest
index 501c653ff..a534d82df 100644
--- a/mail/components/mailComponents.manifest
+++ b/mail/components/mailComponents.manifest
@@ -1,10 +1,10 @@
-component {8cc51368-6aa0-43e8-b762-bde9b9fd828c} aboutRedirector.js
+component {8cc51368-6aa0-43e8-b762-bde9b9fd828c} nsAboutRedirector.js
 # Each addition here should be coupled with a corresponding addition in
-# aboutRedirector.js.
+# nsAboutRedirector.js.
+contract @mozilla.org/network/protocol/about;1?what=downloads {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
+contract @mozilla.org/network/protocol/about;1?what=logopage {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
 contract @mozilla.org/network/protocol/about;1?what=rights {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
 contract @mozilla.org/network/protocol/about;1?what=support {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
-contract @mozilla.org/network/protocol/about;1?what=preferences {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
-contract @mozilla.org/network/protocol/about;1?what=downloads {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
 
 component {44346520-c5d2-44e5-a1ec-034e04d7fac4} nsMailDefaultHandler.js
 contract @mozilla.org/mail/clh;1 {44346520-c5d2-44e5-a1ec-034e04d7fac4}
diff --git a/mail/components/moz.build b/mail/components/moz.build
index 95fb20308..e753fdd61 100644
--- a/mail/components/moz.build
+++ b/mail/components/moz.build
@@ -33,11 +33,11 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'mailcompsbase'
 
 EXTRA_COMPONENTS += [
-    'aboutRedirector.js',
     'DownloadsStartup.js',
     'mailComponents.manifest',
     'mailContentHandler.js',
     'mailGlue.js',
+    'nsAboutRedirector.js',
     'nsMailDefaultHandler.js',
 ]
 
diff --git a/mail/components/aboutRedirector.js b/mail/components/nsAboutRedirector.js
index bc55c2448..cf091ea84 100644
--- a/mail/components/aboutRedirector.js
+++ b/mail/components/nsAboutRedirector.js
@@ -9,10 +9,10 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-const ALLOW_SCRIPT = Ci.nsIAboutModule.ALLOW_SCRIPT;
-const URI_SAFE_FOR_UNTRUSTED_CONTENT = Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT;
-const HIDE_FROM_ABOUTABOUT = Ci.nsIAboutModule.HIDE_FROM_ABOUTABOUT;
-const ENABLE_INDEXED_DB = Ci.nsIAboutModule.ENABLE_INDEXED_DB;
+// See: netwerk/protocol/about/nsIAboutModule.idl
+const URI_SAFE_FOR_UNTRUSTED_CONTENT  = Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT;
+const ALLOW_SCRIPT                    = Ci.nsIAboutModule.ALLOW_SCRIPT;
+const HIDE_FROM_ABOUTABOUT            = Ci.nsIAboutModule.HIDE_FROM_ABOUTABOUT;
 
 function AboutRedirector() {}
 AboutRedirector.prototype = {
@@ -28,6 +28,10 @@ AboutRedirector.prototype = {
       url: "chrome://messenger/content/downloads/aboutDownloads.xul",
       flags: ALLOW_SCRIPT
     },
+    "logopage": {
+      url: "chrome://global/content/logopage.xhtml",
+      flags: (URI_SAFE_FOR_UNTRUSTED_CONTENT || HIDE_FROM_ABOUTABOUT)
+    },
     "support": {
       url: "chrome://messenger/content/about-support/aboutSupport.xhtml",
       flags: ALLOW_SCRIPT