From 5db595e9afed137f6b73aed78a6f487529ccda99 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Wed, 2 Nov 2005 21:17:43 +0000 Subject: [PATCH] Bug 314521 - Software update from tbird 1.5b2 -> 1.5rc1 doesn't update windows registry for add/remove program listing r=mscott git-svn-id: svn://10.0.0.236/trunk@184058 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mail/app/profile/all-thunderbird.js | 2 ++ .../mozapps/update/src/nsPostUpdateWin.js | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mozilla/mail/app/profile/all-thunderbird.js b/mozilla/mail/app/profile/all-thunderbird.js index 5f1b985fde6..b6724385a98 100644 --- a/mozilla/mail/app/profile/all-thunderbird.js +++ b/mozilla/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/"); diff --git a/mozilla/toolkit/mozapps/update/src/nsPostUpdateWin.js b/mozilla/toolkit/mozapps/update/src/nsPostUpdateWin.js index 236d2e85bec..a822d1b9344 100644 --- a/mozilla/toolkit/mozapps/update/src/nsPostUpdateWin.js +++ b/mozilla/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();