bug 758044. Installation directory is now "scheme;host;port" with ";port" omitted if port is the default. Uninstall registry key is now "scheme://host:port" with ":port" omitted if the port is the default. r=felipe

This commit is contained in:
Tim Abraldes 2012-06-04 00:23:17 -07:00
Родитель 930ee483df
Коммит c4bf4ad3c9
1 изменённых файлов: 10 добавлений и 7 удалений

Просмотреть файл

@ -192,12 +192,16 @@ WinNativeApp.prototype = {
// The ${InstallDir} format is as follows: // The ${InstallDir} format is as follows:
// host of the app origin + ";" + // host of the app origin + ";" +
// protocol + ";" + // protocol
// port (-1 for default port) // + ";" + port (only if port is not default)
this.installDir = Services.dirsvc.get("AppData", Ci.nsIFile); this.installDir = Services.dirsvc.get("AppData", Ci.nsIFile);
this.installDir.append(this.launchURI.host + ";" + let installDirLeaf = this.launchURI.scheme
this.launchURI.scheme + ";" + + ";"
this.launchURI.port); + this.launchURI.host;
if (this.launchURI.port != -1) {
installDirLeaf += ";" + this.launchURI.port;
}
this.installDir.append(installDirLeaf);
this.uninstallDir = this.installDir.clone(); this.uninstallDir = this.installDir.clone();
this.uninstallDir.append("uninstall"); this.uninstallDir.append("uninstall");
@ -220,8 +224,7 @@ WinNativeApp.prototype = {
this.startMenuShortcut.followLinks = false; this.startMenuShortcut.followLinks = false;
this.uninstallSubkeyStr = this.launchURI.scheme + "://" + this.uninstallSubkeyStr = this.launchURI.scheme + "://" +
this.launchURI.host + ":" + this.launchURI.hostPort;
this.launchURI.port;
}, },
/** /**