wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 714140 - Charlton Company trademark notice can be removed from About dialog. r=gavin

Browse Source
This commit is contained in:
Justin Dolske 2012-01-22 20:58:19 -08:00
parent 44133c85ae
commit efb157798e
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/aboutDialog.css
View File

@ -57,7 +57,6 @@
list-style-image: url("chrome://global/skin/icons/loading_16.png");
}
.trademark-label,
.text-link,
.text-link:focus {
margin: 0px;

11
browser/base/content/aboutDialog.js
View File

@ -77,17 +77,6 @@ function init(aEvent)
document.getElementById("communityDesc").hidden = true;
}
#ifdef MOZ_OFFICIAL_BRANDING
// Hide the Charlton trademark attribution for non-en-US/en-GB
// DO NOT REMOVE without consulting people involved with bug 616193
let chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].
getService(Components.interfaces.nsIXULChromeRegistry);
let currentLocale = chromeRegistry.getSelectedLocale("global");
if (currentLocale != "en-US" && currentLocale != "en-GB") {
document.getElementById("extra-trademark").hidden = true;
}
#endif
#ifdef MOZ_UPDATER
gAppUpdater = new appUpdater();

8
browser/base/content/aboutDialog.xul
View File

@ -146,13 +146,7 @@
<label class="text-link bottom-link" href="about:rights">&bottomLinks.rights;</label>
<label class="text-link bottom-link" href="http://www.mozilla.com/legal/privacy/">&bottomLinks.privacy;</label>
</hbox>
<description id="trademark">
<label class="trademark-label">&trademarkInfo.part1;</label>
#ifdef MOZ_OFFICIAL_BRANDING
<!-- DO NOT REMOVE without consulting people involved with bug 616193 -->
<label id="extra-trademark" class="trademark-label">Some of the trademarks used under license from The Charlton Company.</label>
#endif
</description>
<description id="trademark">&trademarkInfo.part1;</description>
</vbox>
</vbox>