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 1134315 fix domain origin displayed in activation panel for directory, r=jaws

Browse Source
This commit is contained in:
Shane Caraveo 2015-02-19 11:27:27 -08:00
parent a5a22873dc
commit 17d225705e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toolkit/components/social/SocialService.jsm
View File

@ -160,9 +160,9 @@ function getOriginActivationType(origin) {
let directories = Services.prefs.getCharPref("social.directories").split(',');
if (directories.indexOf(origin) >= 0)
return 'directory';
return "directory";
return 'foreign';
return "foreign";
}
let ActiveProviders = {
@ -549,9 +549,13 @@ this.SocialService = {
let brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
// internal activation does not have a host, use the manifest origin in that case
let requestingURI = Services.io.newURI(data.installType == "internal" ?
data.manifest.origin : data.url, null, null);
// internal/directory activations need to use the manifest origin, any other
// use the domain activation is occurring on
let url = data.url;
if (data.installType == "internal" || data.installType == "directory") {
url = data.manifest.origin;
}
let requestingURI = Services.io.newURI(url, null, null);
let productName = brandBundle.GetStringFromName("brandShortName");
let message = browserBundle.formatStringFromName("service.install.description",