From 262681fa30b18452a00ad1ea3dfc9e60e93c8285 Mon Sep 17 00:00:00 2001
From: "mnyromyr%tprac.de"
 <mnyromyr%tprac.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 20 Jan 2007 20:45:38 +0000
Subject: [PATCH] Bug 366367: SeaMonkey link on mailnews start page incorrect
 in suiterunner; p=Bruno 'Aqualon' Escherl <aqualon@aquachan.de>, r=KaiRo,
 sr=neil

git-svn-id: svn://10.0.0.236/trunk@218711 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/base/resources/content/start.xhtml        | 7 ++++++-
 mozilla/mailnews/base/resources/locale/en-US/start.dtd     | 3 ++-
 mozilla/suite/browser/browser-prefs.js                     | 1 +
 .../suite/locales/en-US/chrome/branding/brand.properties   | 1 +
 mozilla/xpfe/bootstrap/browser-prefs.js                    | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/start.xhtml b/mozilla/mailnews/base/resources/content/start.xhtml
index f69f8784cd9..66ea526dd2f 100644
--- a/mozilla/mailnews/base/resources/content/start.xhtml
+++ b/mozilla/mailnews/base/resources/content/start.xhtml
@@ -77,9 +77,14 @@
 </div>
 
 <script type="application/x-javascript">
-  // get dictionaries and release notes URLs from prefs
+  // get vendor, dictionaries and release notes URLs from prefs
   var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
                             .getService(Components.interfaces.nsIURLFormatter);
+  var vendorURL = formatter.formatURLPref("app.vendorURL");
+  var vendor = document.getElementById("vendorURL");
+  if (vendor)
+    vendor.setAttribute("href", vendorURL);
+
   var dictURL = formatter.formatURLPref("spellchecker.dictionaries.download.url");
   var dictionaries = document.getElementById("dictURL");
   if (dictionaries)
diff --git a/mozilla/mailnews/base/resources/locale/en-US/start.dtd b/mozilla/mailnews/base/resources/locale/en-US/start.dtd
index b4470a91529..c81ffa52d5f 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/start.dtd
+++ b/mozilla/mailnews/base/resources/locale/en-US/start.dtd
@@ -36,8 +36,9 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY startpage.title "Welcome to &brandShortName; Mail &amp; Newsgroups">
+<!--# LOCALIZATION NOTE (headline.label): the URL for <a id="vendorURL"> is fetched from brand.properties -->
 <!ENTITY headline.label
-'Welcome to <a href="&vendorURL;">&brandShortName;</a> Mail &amp; Newsgroups!'>
+'Welcome to <a id="vendorURL" href="">&brandShortName;</a> Mail &amp; Newsgroups!'>
 <!ENTITY description.label
 "&brandShortName; Mail &amp; Newsgroups is a powerful open-source mail and news
 client, supporting advanced junk mail detection and other useful features.">
diff --git a/mozilla/suite/browser/browser-prefs.js b/mozilla/suite/browser/browser-prefs.js
index 075b7fdacc3..4d9b2fe2d39 100644
--- a/mozilla/suite/browser/browser-prefs.js
+++ b/mozilla/suite/browser/browser-prefs.js
@@ -205,6 +205,7 @@ pref("layout.spellcheckDefault", 1);
 pref("accessibility.typeaheadfind.flashBar", 0);
 
 pref("app.releaseNotesURL", "chrome://branding/locale/brand.properties");
+pref("app.vendorURL", "chrome://branding/locale/brand.properties");
 
 // App-specific update preferences
 
diff --git a/mozilla/suite/locales/en-US/chrome/branding/brand.properties b/mozilla/suite/locales/en-US/chrome/branding/brand.properties
index aa7874b0070..b51d3ccd2b7 100644
--- a/mozilla/suite/locales/en-US/chrome/branding/brand.properties
+++ b/mozilla/suite/locales/en-US/chrome/branding/brand.properties
@@ -7,4 +7,5 @@ extensions.getMoreExtensionsURL=https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%A
 extensions.getMoreThemesURL=https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/themes/
 spellchecker.dictionaries.download.url=https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/dictionaries/
 app.releaseNotesURL=http://www.mozilla.org/projects/seamonkey/releases/seamonkey%VERSION%/
+app.vendorURL=http://www.mozilla.org/projects/seamonkey/
 keyword.moreInfoURL=http://www.mozilla.org/docs/end-user/internet-keywords.html
diff --git a/mozilla/xpfe/bootstrap/browser-prefs.js b/mozilla/xpfe/bootstrap/browser-prefs.js
index 0ecc9367c17..2bad59a56db 100644
--- a/mozilla/xpfe/bootstrap/browser-prefs.js
+++ b/mozilla/xpfe/bootstrap/browser-prefs.js
@@ -201,6 +201,7 @@ pref("spellchecker.dictionaries.download.url", "chrome://branding/locale/brand.p
 pref("layout.spellcheckDefault", 1);
 
 pref("app.releaseNotesURL", "chrome://branding/locale/brand.properties");
+pref("app.vendorURL", "chrome://branding/locale/brand.properties");
 
 pref("extensions.getMoreLocalesURL", "chrome://branding/locale/brand.properties");