Bug 314521 - Software update from tbird 1.5b2 -> 1.5rc1 doesn't update windows registry for add/remove program listing r=mscott

mail/app/profile/all-thunderbird.js

@@ -74,6 +74,8 @@ pref("app.update.silent", false);
 
 // Update service URL:
 pref("app.update.url", "https://aus2.mozilla.org/update/1/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/update.xml");
+pref("app.update.vendorName.override", "Mozilla");
+
 // 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/");

toolkit/mozapps/update/src/nsPostUpdateWin.js

@@ -573,7 +573,21 @@ function updateRegistry(rootKey) {
       getService(Components.interfaces.nsIStringBundleService);
   var brandBundle = sbs.createBundle(URI_BRAND_PROPERTIES);
   var brandFullName = brandBundle.GetStringFromName("brandFullName");
-  var vendorShortName = brandBundle.GetStringFromName("vendorShortName");
+
+  var vendorShortName;
+  try {
+    // The Thunderbird vendorShortName is "Mozilla Thunderbird", but we
+    // just want "Thunderbird", so allow it to be overridden in prefs.
+
+    var prefs =
+      Components.classes["@mozilla.org/preferences-service;1"].
+      getService(Components.interfaces.nsIPrefBranch);
+
+    vendorShortName = prefs.getCharPref("app.update.vendorName.override");
+  }
+  catch (e) {
+    vendorShortName = brandBundle.GetStringFromName("vendorShortName");
+  }
 
   var key = new RegKey();