305226 - details link in software update is broken. make sure there's a fallback url if the update.xml file does not provide one. r=darin, mscott a=mscott

browser/app/profile/firefox.js

@@ -98,6 +98,10 @@ pref("app.update.url", "https://aus2.mozilla.org/update/1/%PRODUCT%/%VERSION%/%B
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.  TODO: Change this URL
 pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/");
+// 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", "chrome://browser-region/locale/region.properties");
+
 // User-settable override to app.update.url for testing purposes.
 //pref("app.update.url.override", "");
 

browser/locales/en-US/chrome/browser-region/region.properties

@@ -25,3 +25,7 @@ update_notifications.provider.0.datasource=
 
 searchEnginesURL=http://www.mozilla.org/products/firefox/add-engines.html
 feedLiveBookmarkInfoURL=http://www.mozilla.org/products/firefox/live-bookmarks
+
+# This is the fallback URL for release notes. Do not change this 
+# unless you are providing localized release notes!
+app.update.url.details=http://www.mozilla.org/products/firefox/releases/

mail/app/profile/all-thunderbird.js

@@ -77,6 +77,9 @@ pref("app.update.url", "https://aus2.mozilla.org/update/1/%PRODUCT%/%VERSION%/%B
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.  TODO: Change this URL
 pref("app.update.url.manual", "http://www.mozilla.org/products/thunderbird/");
+// 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", "chrome://messenger-region/locale/region.properties");
 // User-settable override to app.update.url for testing purposes.
 //pref("app.update.url.override", "");
 

mail/locales/en-US/chrome/messenger-region/region.properties

@@ -15,3 +15,8 @@ messenger.throbber.url=http://www.mozilla.org/products/thunderbird/
 # @ZI == zip code
 # @CO == country
 mail.addr_book.mapit_url.format=http://www.mapquest.com/maps/map.adp?country=@CO&address=@A1%20@A2&city=@CI&state=@ST&zipcode=@ZI
+
+
+# This is the fallback URL for release notes. Do not change this 
+# unless you are providing localized release notes!
+app.update.url.details=http://www.mozilla.org/products/thunderbird/releases/

toolkit/mozapps/update/content/updates.xul

@@ -114,7 +114,9 @@
             </hbox>
           </vbox>
         </hbox>
-        <label class="text-link" id="updateMoreInfoURL" value="&clickHere.label;"/>
+        <hbox>
+          <label class="text-link" id="updateMoreInfoURL" value="&clickHere.label;"/>
+        </hbox>
       </vbox>
     </deck>
   </wizardpage>

toolkit/mozapps/update/src/nsUpdateService.js.in

@@ -45,6 +45,7 @@ const PREF_APP_UPDATE_TIMER               = "app.update.timer";
 const PREF_APP_UPDATE_LOG_BRANCH          = "app.update.log.";
 const PREF_APP_UPDATE_URL                 = "app.update.url";
 const PREF_APP_UPDATE_URL_OVERRIDE        = "app.update.url.override";
+const PREF_APP_UPDATE_URL_DETAILS         = "app.update.url.details";
 const PREF_APP_UPDATE_CHANNEL             = "app.update.channel";
 const PREF_APP_UPDATE_SHOW_INSTALLED_UI   = "app.update.showInstalledUI";
 const PREF_APP_UPDATE_LASTUPDATETIME_FMT  = "app.update.lastUpdateTime.%ID%";
@@ -615,6 +616,8 @@ function Update(update) {
       this.isCompleteUpdate = attr.value == "true";
     else if (attr.name == "isSecurityUpdate")
       this.isSecurityUpdate = attr.value == "true";
+    else if (attr.name == "detailsURL")
+      this._detailsURL = attr.value;
     else
       this[attr.name] = attr.value;
   }
@@ -682,6 +685,23 @@ Update.prototype = {
     return null;
   },
   
+  /**
+   * See nsIUpdateService.idl
+   */
+  get detailsURL() {
+    if (!this._detailsURL) {
+      try {
+        // Try using a default details URL supplied by the distribution
+        // if the update XML does not supply one.
+        return gPref.getComplexValue(PREF_APP_UPDATE_URL_DETAILS,
+                                     nsIPrefLocalizedString).data;
+      }
+      catch (e) {
+      }
+    }
+    return this._detailsURL || "";
+  },
+  
   /**
    * See nsIUpdateService.idl
    */