diff --git a/profile/defaults/bookmarks.html b/profile/defaults/bookmarks.html
index 7c091ee0a..6d4d69f98 100644
--- a/profile/defaults/bookmarks.html
+++ b/profile/defaults/bookmarks.html
@@ -18,7 +18,7 @@
Bookmarks
mozilla.org
- The Mozilla Organization
-
- RetroZilla Project
+
- RetroZilla Project
- Mozilla Products
- Feedback
@@ -40,5 +40,5 @@
Bookmarks
Internet Search
- Startpage Web Search
+
diff --git a/profile/defaults/search.rdf b/profile/defaults/search.rdf
index 363b74b5a..2540f2037 100644
--- a/profile/defaults/search.rdf
+++ b/profile/defaults/search.rdf
@@ -67,7 +67,7 @@
-
+
diff --git a/xpfe/global/resources/content/about.xhtml b/xpfe/global/resources/content/about.xhtml
index 09e035543..08e638eda 100644
--- a/xpfe/global/resources/content/about.xhtml
+++ b/xpfe/global/resources/content/about.xhtml
@@ -101,7 +101,7 @@ h1 {
-- Copyright © 1998–2010, 2015-2018 by Contributors to
+
- Copyright © 1998–2010, 2015-2019 by Contributors to
the Mozilla and RetroZilla codebases under the Mozilla Public License
and other licenses. All Rights Reserved.
diff --git a/xpfe/global/resources/content/aboutChangelog.html b/xpfe/global/resources/content/aboutChangelog.html
index 5b638a609..acfafd3ff 100644
--- a/xpfe/global/resources/content/aboutChangelog.html
+++ b/xpfe/global/resources/content/aboutChangelog.html
@@ -21,6 +21,7 @@ New Features
- Various security fixes
- Various build system changes
- RetroZilla Browser (Firefox) code added
+ - Non-standard ports of gopher can now be accessed by toggling network.gopher.port-restricted in about:config
- Typing search queries directly in the URLbar now supported
Bug Fixes
diff --git a/xpinstall/packager/win_gre/config.ini b/xpinstall/packager/win_gre/config.ini
index 2101c0fc7..cc90513d8 100644
--- a/xpinstall/packager/win_gre/config.ini
+++ b/xpinstall/packager/win_gre/config.ini
@@ -79,7 +79,7 @@ Uninstall Filename=GREUninstall.exe
; This key is used as a fail over key. This url will be used when the
; url in the Site Selector fails.
-url=ftp://not.supplied.invalid
+url=http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/windows-xpi
; Default Setup Type values:
; Setup Type 0 - first radio button (default)
@@ -142,7 +142,7 @@ Show Dialog=TRUE
;*** LOCALIZE ME BABY ***
Title=GRE Setup - Welcome
;*** LOCALIZE ME BABY ***
-Message0=Welcome to %s Setup. You are about to install %s version 2.1.0.0000000000.
+Message0=Welcome to %s Setup. You are about to install %s version 2.2.0.0000000000.
;*** LOCALIZE ME BABY ***
Message1=It is strongly recommended that you exit all Windows programs before running this Setup program.
;*** LOCALIZE ME BABY ***
@@ -655,7 +655,7 @@ Timing=post smartupdate
Root Key=HKEY_LOCAL_MACHINE
Key=[REGPATH]\Uninstall
Name=Description
-Name Value=GRE (2.1)
+Name Value=GRE (2.2)
Type=REG_SZ
Decrypt Key=TRUE
Decrypt Name=FALSE
@@ -820,11 +820,11 @@ Identifier0=Site0
;*** LOCALIZE ME BABY ***
Description0=Default
;*** LOCALIZE ME BABY ***
-Domain0=ftp://not.supplied.invalid
+Domain0=http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/windows-xpi
Identifier1=Site1
;*** LOCALIZE ME BABY ***
Description1=North America
;*** LOCALIZE ME BABY ***
-Domain1=ftp://not.supplied.invalid
+Domain1=http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/windows-xpi
diff --git a/xpinstall/packager/win_gre/gre.js b/xpinstall/packager/win_gre/gre.js
index 85f328edb..f614a8c99 100644
--- a/xpinstall/packager/win_gre/gre.js
+++ b/xpinstall/packager/win_gre/gre.js
@@ -191,7 +191,7 @@ function registerMainKeys(winreg)
subkey = regRootKey + "\\Uninstall";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Uninstall Log Folder", fProgram + "Uninstall");
- err = winreg.setValueString(subkey, "Description", "GRE (2.1)");
+ err = winreg.setValueString(subkey, "Description", "GRE (2.2)");
}
// main
@@ -210,7 +210,7 @@ var regRootKey;
regRootKey = new String(Install.arguments);
srDest = 1;
-err = initInstall("GRE", "GRE", "2.1.0.0000000000");
+err = initInstall("GRE", "GRE", "2.2.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
diff --git a/xpinstall/packager/win_gre/xpcom.js b/xpinstall/packager/win_gre/xpcom.js
index c2c97b433..ab22e4921 100644
--- a/xpinstall/packager/win_gre/xpcom.js
+++ b/xpinstall/packager/win_gre/xpcom.js
@@ -116,7 +116,7 @@ var fileMsvcrt;
var fileMsvcirt;
srDest = 1;
-err = initInstall("Mozilla XPCOM", "XPCOM", "2.1.0.0000000000");
+err = initInstall("Mozilla XPCOM", "XPCOM", "2.2.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@@ -137,7 +137,7 @@ if(verifyDiskSpace(fProgram, srDest))
upgradeCleanup();
err = addDirectory("",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
@@ -156,7 +156,7 @@ if(verifyDiskSpace(fProgram, srDest))
{
logComment("File not found: " + fileMsvcrt);
addFile("/Microsoft/Shared/msvcrt.dll",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"msvcrt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fProgram
@@ -178,7 +178,7 @@ if(verifyDiskSpace(fProgram, srDest))
{
logComment("File not found: " + fileMsvcirt);
addFile("/Microsoft/Shared/msvcirt.dll",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"msvcirt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fProgram
diff --git a/xpinstall/packager/windows/browser.js b/xpinstall/packager/windows/browser.js
index 159c316f0..d54584d61 100644
--- a/xpinstall/packager/windows/browser.js
+++ b/xpinstall/packager/windows/browser.js
@@ -105,12 +105,12 @@ function registerProgramFolderKey(winreg, fFolderPath)
subkey = "SOFTWARE\\RetroZilla\\RetroZilla";
winreg.createKey(subkey,"");
- err = winreg.setValueString(subkey, "CurrentVersion", "2.1 (en)");
+ err = winreg.setValueString(subkey, "CurrentVersion", "2.2 (en)");
- subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)";
+ subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)";
winreg.createKey(subkey,"");
- subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Main";
+ subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Main";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Program Folder Path", fFolderPath);
}
@@ -219,7 +219,7 @@ function createShortcuts()
}
logComment("folderQuickLaunchExists: " + folderQuickLaunchExists);
- subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Main";
+ subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Main";
fFolderPathStr = winreg.getValueString(subkey, "Program Folder Path");
if((fFolderPathStr == "") || (fFolderPathStr == null))
{
@@ -293,7 +293,7 @@ function createShortcuts()
fileDelete(fFolderPath);
}
- subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Setup";
+ subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Setup";
regvalue = winreg.getValueString(subkey, "browserargs");
/* log this so if the user turns on turbo mode in the browser the uninstaller will undo it */
@@ -366,12 +366,12 @@ function registerMainKeys(winreg)
subkey = "SOFTWARE\\RetroZilla\\RetroZilla";
winreg.createKey(subkey,"");
- err = winreg.setValueString(subkey, "CurrentVersion", "2.1 (en)");
+ err = winreg.setValueString(subkey, "CurrentVersion", "2.2 (en)");
- subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)";
+ subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)";
winreg.createKey(subkey,"");
- subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Main";
+ subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Main";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Install Directory", fProgram);
@@ -379,20 +379,20 @@ function registerMainKeys(winreg)
// The following keys are required to be created to supply information
// about the location of the Gecko Embedded Client to 3rd party apps.
// "SOFTWARE\\Mozilla" must not be localized!
- subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.1";
+ subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.2";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "GeckoVer", "$GreVersion$");
- subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.1\\Extensions";
+ subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.2\\Extensions";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Components", fProgram + "Components");
err = winreg.setValueString(subkey, "Plugins", fProgram + "Plugins");
- subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.1\\bin";
+ subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.2\\bin";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "PathToExe", fProgram + "RetroZilla.exe");
- subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Main";
+ subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Main";
err = winreg.setValueString(subkey, "PathToExe", fProgram + "RetroZilla.exe");
// Register as a windows XP internet browser
@@ -416,7 +416,7 @@ function registerMainKeys(winreg)
data = "\"" + fProgram + "RetroZilla.exe\"";
winreg.setValueString(subkey + "\\shell\\open\\command", "", data);
- data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.1 (en)\" /hs browser";
+ data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.2 (en)\" /hs browser";
winreg.setValueString(subkey + "\\InstallInfo", "HideIconsCommand", data);
winreg.setValueNumber(subkey + "\\InstallInfo", "IconsVisible", 1);
@@ -424,7 +424,7 @@ function registerMainKeys(winreg)
data = "\"" + fProgram + "RetroZilla.exe\" -silent -nosplash -setDefaultBrowser ";
winreg.setValueString(subkey + "\\InstallInfo", "ReinstallCommand", data);
- data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.1 (en)\" /ss browser";
+ data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.2 (en)\" /ss browser";
winreg.setValueString(subkey + "\\InstallInfo", "ShowIconsCommand", data);
}
}
@@ -725,7 +725,7 @@ if(args == "-greLocal")
gGreLocal = true;
srDest = 1;
-err = initInstall("RetroZilla", "Browser", "2.1.0.0000000000");
+err = initInstall("RetroZilla", "Browser", "2.2.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@@ -738,7 +738,7 @@ if(verifyDiskSpace(fProgram, srDest))
upgradeCleanup();
err = addDirectory("",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
@@ -830,7 +830,7 @@ if(verifyDiskSpace(fProgram, srDest))
if (! ('buildID' in Install))
{
logComment("Running Pre-Mozilla 0.9.1");
- initInstall("Post-install Cleanup Utility", "Browser/xpicleanup", "2.1.0.0000000000");
+ initInstall("Post-install Cleanup Utility", "Browser/xpicleanup", "2.2.0.0000000000");
cleanupUtility = getFolder(fProgram, "xpicleanup.exe");
err = File.execute(cleanupUtility);
logComment("execute() returned: " + err);
diff --git a/xpinstall/packager/windows/chatzilla.js b/xpinstall/packager/windows/chatzilla.js
index d34df76d9..1b997d11a 100644
--- a/xpinstall/packager/windows/chatzilla.js
+++ b/xpinstall/packager/windows/chatzilla.js
@@ -95,7 +95,7 @@ function getPlatform()
return platformNode;
}
-var err = initInstall("Chatzilla v0.5", "Chatzilla", "2.1.0.0000000000");
+var err = initInstall("Chatzilla v0.5", "Chatzilla", "2.2.0.0000000000");
logComment("initInstall: " + err);
addFile("Chatzilla service",
diff --git a/xpinstall/packager/windows/config.ini b/xpinstall/packager/windows/config.ini
index 3ed813b7e..8196d9f6b 100644
--- a/xpinstall/packager/windows/config.ini
+++ b/xpinstall/packager/windows/config.ini
@@ -10,7 +10,7 @@ Run Mode=Normal
Company Name=RetroZilla
Product Name=RetroZilla
Product NameInternal=RetroZilla
-User Agent=2.1 (en)
+User Agent=2.2 (en)
; Destination Path values:
; PROGRAMFILESDIR
@@ -75,7 +75,7 @@ Uninstall Filename=retrozillaUninstall.exe
; This key is used as a fail over key. This url will be used when the
; url in the Site Selector fails.
-url=ftp://not.supplied.invalid
+url=http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/windows-xpi
; Default Setup Type values:
; Setup Type 0 - first radio button (default)
@@ -188,7 +188,7 @@ Show Dialog=TRUE
;*** LOCALIZE ME BABY ***
Title=RetroZilla Setup - Welcome
;*** LOCALIZE ME BABY ***
-Message0=Welcome to %s Setup. You are about to install %s version 2.1.0.0000000000.
+Message0=Welcome to %s Setup. You are about to install %s version 2.2.0.0000000000.
;*** LOCALIZE ME BABY ***
Message1=It is strongly recommended that you exit all Windows programs before running this Setup program.
;*** LOCALIZE ME BABY ***
@@ -618,7 +618,7 @@ Install Size System=1
Install Size Archive=1
Attributes=SELECTED|UNCOMPRESS|SUPERSEDE|LAUNCHAPP|INVISIBLE
;*** LOCALIZE ME BABY ***
-Parameter=-mmi -ms -app "RetroZilla 2.1 (en)" -app_path "[SETUP PATH]\RetroZilla.exe"
+Parameter=-mmi -ms -app "RetroZilla 2.2 (en)" -app_path "[SETUP PATH]\RetroZilla.exe"
SupersedeType=GRE
SupersedeWinReg0=HKEY_LOCAL_MACHINE\Software\mozilla.org\GRE
SupersedeVersion0=0.0.0.0
@@ -1025,7 +1025,7 @@ Timing=pre smartupdate
[Windows Registry2]
Root Key=HKEY_LOCAL_MACHINE
;*** LOCALIZE ME BABY ***
-Key=Software\RetroZilla\RetroZilla\2.1 (en)
+Key=Software\RetroZilla\RetroZilla\2.2 (en)
Name=
Name Value=
Type=REG_SZ
@@ -1039,7 +1039,7 @@ Timing=pre smartupdate
[Windows Registry3]
Root Key=HKEY_LOCAL_MACHINE
;*** LOCALIZE ME BABY ***
-Key=Software\RetroZilla\RetroZilla\2.1 (en)\Main
+Key=Software\RetroZilla\RetroZilla\2.2 (en)\Main
Name=Program Folder Path
Name Value=[Default Folder]
Type=REG_SZ
@@ -1053,9 +1053,9 @@ Timing=pre smartupdate
[Windows Registry4]
Root Key=HKEY_LOCAL_MACHINE
;*** LOCALIZE ME BABY ***
-Key=Software\RetroZilla\RetroZilla\2.1 (en)\Uninstall
+Key=Software\RetroZilla\RetroZilla\2.2 (en)\Uninstall
Name=Description
-Name Value=RetroZilla (2.1)
+Name Value=RetroZilla (2.2)
Type=REG_SZ
Decrypt Key=FALSE
Decrypt Name=FALSE
@@ -1067,7 +1067,7 @@ Timing=pre smartupdate
[Windows Registry5]
Root Key=HKEY_LOCAL_MACHINE
;*** LOCALIZE ME BABY ***
-Key=Software\RetroZilla\RetroZilla\2.1 (en)\Uninstall
+Key=Software\RetroZilla\RetroZilla\2.2 (en)\Uninstall
Name=Uninstall Log Folder
Name Value=[SETUP PATH]\uninstall
Type=REG_SZ
@@ -1109,7 +1109,7 @@ Timing=pre smartupdate
[Windows Registry8]
Root Key=HKEY_CURRENT_USER
;*** LOCALIZE ME BABY ***
-Key=Software\RetroZilla\RetroZilla\2.1 (en)
+Key=Software\RetroZilla\RetroZilla\2.2 (en)
Name=
Name Value=
Type=REG_SZ
@@ -1123,7 +1123,7 @@ Timing=pre smartupdate
[Windows Registry9]
Root Key=HKEY_CURRENT_USER
;*** LOCALIZE ME BABY ***
-Key=Software\RetroZilla\RetroZilla\2.1 (en)\Main
+Key=Software\RetroZilla\RetroZilla\2.2 (en)\Main
Name=Program Folder Path
Name Value=[Default Folder]
Type=REG_SZ
@@ -1137,9 +1137,9 @@ Timing=pre smartupdate
[Windows Registry10]
Root Key=HKEY_CURRENT_USER
;*** LOCALIZE ME BABY ***
-Key=Software\RetroZilla\RetroZilla\2.1 (en)\Uninstall
+Key=Software\RetroZilla\RetroZilla\2.2 (en)\Uninstall
Name=Description
-Name Value=RetroZilla (2.1)
+Name Value=RetroZilla (2.2)
Type=REG_SZ
Decrypt Key=FALSE
Decrypt Name=FALSE
@@ -1151,7 +1151,7 @@ Timing=pre smartupdate
[Windows Registry11]
Root Key=HKEY_CURRENT_USER
;*** LOCALIZE ME BABY ***
-Key=Software\RetroZilla\RetroZilla\2.1 (en)\Uninstall
+Key=Software\RetroZilla\RetroZilla\2.2 (en)\Uninstall
Name=Uninstall Log Folder
Name Value=[SETUP PATH]\uninstall
Type=REG_SZ
@@ -1164,9 +1164,9 @@ Timing=pre smartupdate
[Windows Registry12]
Root Key=HKEY_LOCAL_MACHINE
-Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\RetroZilla (2.1)
+Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\RetroZilla (2.2)
Name=DisplayName
-Name Value=RetroZilla (2.1)
+Name Value=RetroZilla (2.2)
Type=REG_SZ
Decrypt Key=FALSE
Decrypt Name=FALSE
@@ -1177,10 +1177,10 @@ Timing=post smartupdate
[Windows Registry13]
Root Key=HKEY_LOCAL_MACHINE
-Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\RetroZilla (2.1)
+Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\RetroZilla (2.2)
Name=UninstallString
;*** LOCALIZE ME BABY ***
-Name Value=[WINDIR]\retrozillaUninstall.exe /ua "2.1 (en)"
+Name Value=[WINDIR]\retrozillaUninstall.exe /ua "2.2 (en)"
Type=REG_SZ
Decrypt Key=FALSE
Decrypt Name=FALSE
@@ -1208,12 +1208,12 @@ Timing=pre smartupdate
Reg Key Root0=HKEY_LOCAL_MACHINE
Product Name0=RetroZilla
Product Reg Key0=Software\RetroZilla\RetroZilla
-Current Version0=2.1 (en)
+Current Version0=2.2 (en)
Reg Key Root1=HKEY_CURRENT_USER
Product Name1=RetroZilla
Product Reg Key1=Software\RetroZilla\RetroZilla
-Current Version1=2.1 (en)
+Current Version1=2.2 (en)
@@ -1249,7 +1249,7 @@ Program Folder=[Default Folder]
[Program Folder0-Shortcut0]
File=[SETUP PATH]\uninstall\retrozillaUninstall.exe
-Arguments=/ua "2.1 (en)"
+Arguments=/ua "2.2 (en)"
Working Dir=[SETUP PATH]
Description=Uninstall RetroZilla
Icon Path=[SETUP PATH]\uninstall\retrozillaUninstall.exe
@@ -1372,11 +1372,11 @@ Identifier0=Site0
;*** LOCALIZE ME BABY ***
Description0=Default
;*** LOCALIZE ME BABY ***
-Domain0=ftp://not.supplied.invalid
+Domain0=http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/windows-xpi
Identifier1=Site1
;*** LOCALIZE ME BABY ***
Description1=North America
;*** LOCALIZE ME BABY ***
-Domain1=ftp://not.supplied.invalid
+Domain1=http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/windows-xpi
diff --git a/xpinstall/packager/windows/deflenus.js b/xpinstall/packager/windows/deflenus.js
index e55221ee6..ffad2757c 100644
--- a/xpinstall/packager/windows/deflenus.js
+++ b/xpinstall/packager/windows/deflenus.js
@@ -106,7 +106,7 @@ var regName = "defaults/mozilla/en-US";
// --- END CHANGABLE STUFF ---
srDest = 1;
-err = initInstall(prettyName, regName, "2.1.0.0000000000");
+err = initInstall(prettyName, regName, "2.2.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@@ -117,7 +117,7 @@ if(verifyDiskSpace(fProgram, srDest))
setPackageFolder(fProgram);
err = addDirectory("",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
diff --git a/xpinstall/packager/windows/inspector.js b/xpinstall/packager/windows/inspector.js
index e1ddd379c..9f3719110 100644
--- a/xpinstall/packager/windows/inspector.js
+++ b/xpinstall/packager/windows/inspector.js
@@ -95,13 +95,13 @@ function getPlatform()
return platformNode;
}
-var err = initInstall("DOM Inspector", "Inspector", "2.1.0.0000000000");
+var err = initInstall("DOM Inspector", "Inspector", "2.2.0.0000000000");
logComment("initInstall: " + err);
var fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
-err = addDirectory("", "2.1.0.0000000000", "bin", fProgram, "", true);
+err = addDirectory("", "2.2.0.0000000000", "bin", fProgram, "", true);
logComment("addDirectory: " + err);
addFile("Inspector Command Line Handler",
diff --git a/xpinstall/packager/windows/langenus.js b/xpinstall/packager/windows/langenus.js
index 0c48d11e0..f3d92749c 100644
--- a/xpinstall/packager/windows/langenus.js
+++ b/xpinstall/packager/windows/langenus.js
@@ -117,7 +117,7 @@ var platformName = langcode + "-" + platformNode + ".jar";
var localeName = "locale/" + chromeNode + "/";
srDest = 1;
-err = initInstall(prettyName, regName, "2.1.0.0000000000");
+err = initInstall(prettyName, regName, "2.2.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
diff --git a/xpinstall/packager/windows/mail.js b/xpinstall/packager/windows/mail.js
index f568a2496..64a4e2f1d 100644
--- a/xpinstall/packager/windows/mail.js
+++ b/xpinstall/packager/windows/mail.js
@@ -128,12 +128,12 @@ function registerProgramFolderKey(winreg, fFolderPath)
subkey = "SOFTWARE\\RetroZilla\\RetroZilla";
winreg.createKey(subkey,"");
- err = winreg.setValueString(subkey, "CurrentVersion", "2.1 (en)");
+ err = winreg.setValueString(subkey, "CurrentVersion", "2.2 (en)");
- subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)";
+ subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)";
winreg.createKey(subkey,"");
- subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Main";
+ subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Main";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Program Folder Path", fFolderPath);
}
@@ -256,7 +256,7 @@ function createShortcuts()
}
logComment("folderQuickLaunchExists: " + folderQuickLaunchExists);
- subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Main";
+ subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Main";
fFolderPathStr = winreg.getValueString(subkey, "Program Folder Path");
if((fFolderPathStr == "") || (fFolderPathStr == null))
{
@@ -351,7 +351,7 @@ function createShortcuts()
data = "\"" + fProgram + "RetroZilla.exe\" -mail";
winreg.setValueString(subkey + "\\shell\\open\\command", "", data);
- data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.1 (en)\" /hs mail";
+ data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.2 (en)\" /hs mail";
winreg.setValueString(subkey + "\\InstallInfo", "HideIconsCommand", data);
// set this value to 0 because we're not creating the mail shortcuts yet.
@@ -360,7 +360,7 @@ function createShortcuts()
data = "\"" + fProgram + "RetroZilla.exe\" -silent -nosplash -setDefaultMail";
winreg.setValueString(subkey + "\\InstallInfo", "ReinstallCommand", data);
- data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.1 (en)\" /ss mail";
+ data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.2 (en)\" /ss mail";
winreg.setValueString(subkey + "\\InstallInfo", "ShowIconsCommand", data);
}
}
@@ -407,7 +407,7 @@ function updateMapi()
// uninstaller already has a special way to deal with restoring the
// appropriate previous Mapi32.dll.
addFile("",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"bin/mozMapi32.dll", // file name in jar to extract
getFolder("Win System"), // Where to put this file (Returned from getFolder)
"Mapi32.dll", // new name when installed
@@ -473,7 +473,7 @@ var err;
var fProgram;
srDest = 1;
-err = initInstall("RetroZilla Mail", "Mail", "2.1.0.0000000000");
+err = initInstall("RetroZilla Mail", "Mail", "2.2.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@@ -485,7 +485,7 @@ if(verifyDiskSpace(fProgram, srDest))
upgradeCleanup();
err = addDirectory("",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
diff --git a/xpinstall/packager/windows/regus.js b/xpinstall/packager/windows/regus.js
index c80a1a1b7..c84ba07e4 100644
--- a/xpinstall/packager/windows/regus.js
+++ b/xpinstall/packager/windows/regus.js
@@ -112,7 +112,7 @@ var chromeName = chromeNode + ".jar";
var localeName = "locale/" + chromeNode + "/";
srDest = 1;
-err = initInstall(prettyName, regName, "2.1.0.0000000000");
+err = initInstall(prettyName, regName, "2.2.0.0000000000");
logComment("initInstall: " + err);
if (platformNode == 'mac')
diff --git a/xpinstall/packager/windows/reporter.js b/xpinstall/packager/windows/reporter.js
index dfe3daa33..bd91f30a7 100644
--- a/xpinstall/packager/windows/reporter.js
+++ b/xpinstall/packager/windows/reporter.js
@@ -95,7 +95,7 @@ function getPlatform()
return platformNode;
}
-var err = initInstall("Website Reporter", "Reporter", "2.1.0.0000000000");
+var err = initInstall("Website Reporter", "Reporter", "2.2.0.0000000000");
logComment("initInstall: " + err);
var fProgram = getFolder("Program");
@@ -104,7 +104,7 @@ var srDest = 1;
if (verifyDiskSpace(fProgram, srDest))
{
- err = addDirectory("", "2.1.0.0000000000", "bin", fProgram, "", true);
+ err = addDirectory("", "2.2.0.0000000000", "bin", fProgram, "", true);
logComment("addDirectory: " + err);
var jarFolder = getFolder("Chrome", "reporter.jar");
diff --git a/xpinstall/packager/windows/spellcheck.js b/xpinstall/packager/windows/spellcheck.js
index 9535124c3..21ab1b82d 100644
--- a/xpinstall/packager/windows/spellcheck.js
+++ b/xpinstall/packager/windows/spellcheck.js
@@ -97,7 +97,7 @@ function getPlatform()
var srDest = 1;
-var err = initInstall("RetroZilla Myspell Spellchecker", "Spellchecker", "2.1.0.0000000000");
+var err = initInstall("RetroZilla Myspell Spellchecker", "Spellchecker", "2.2.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@@ -108,7 +108,7 @@ if (verifyDiskSpace(fProgram, srDest))
setPackageFolder(fProgram);
addDirectory("Spellchecker",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"bin",
fProgram,
"");
diff --git a/xpinstall/packager/windows/sroaming.js b/xpinstall/packager/windows/sroaming.js
index f8562708a..547121945 100644
--- a/xpinstall/packager/windows/sroaming.js
+++ b/xpinstall/packager/windows/sroaming.js
@@ -95,13 +95,13 @@ function getPlatform()
return platformNode;
}
-var err = initInstall("SRoaming v0.1", "Roaming", "2.1.0.0000000000");
+var err = initInstall("SRoaming v0.1", "Roaming", "2.2.0.0000000000");
logComment("initInstall: " + err);
var fProgram = getFolder("Program");
logComment("fProgram: " + fProgram);
-err = addDirectory("", "2.1.0.0000000000", "bin", fProgram, "", true);
+err = addDirectory("", "2.2.0.0000000000", "bin", fProgram, "", true);
logComment("addDirectory: " + err);
addFile("SRoaming Chrome",
diff --git a/xpinstall/packager/windows/talkback.js b/xpinstall/packager/windows/talkback.js
index b2cc0b810..ec8b4f6df 100644
--- a/xpinstall/packager/windows/talkback.js
+++ b/xpinstall/packager/windows/talkback.js
@@ -108,7 +108,7 @@ var err;
var communicatorFolder;
srDest = 1;
-err = initInstall("Quality Feedback Utility", "Quality Feedback Utility", "2.1.0.0000000000");
+err = initInstall("Quality Feedback Utility", "Quality Feedback Utility", "2.2.0.0000000000");
logComment("initInstall: " + err);
communicatorFolder = getFolder("Communicator");
@@ -120,7 +120,7 @@ if(verifyDiskSpace(communicatorFolder, srDest))
upgradeCleanup();
err = addDirectory("",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"bin", // dir name in jar to extract
communicatorFolder, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to communicatorFolder
diff --git a/xpinstall/packager/windows/venkman.js b/xpinstall/packager/windows/venkman.js
index f6f92e64b..47ac719a3 100644
--- a/xpinstall/packager/windows/venkman.js
+++ b/xpinstall/packager/windows/venkman.js
@@ -95,7 +95,7 @@ function getPlatform()
return platformNode;
}
-var err = initInstall("JavaScript Debugger", "Venkman", "2.1.0.0000000000");
+var err = initInstall("JavaScript Debugger", "Venkman", "2.2.0.0000000000");
logComment("initInstall: " + err);
addFile("Venkman Service",
diff --git a/xpinstall/packager/windows/xpcom.js b/xpinstall/packager/windows/xpcom.js
index c2c97b433..ab22e4921 100644
--- a/xpinstall/packager/windows/xpcom.js
+++ b/xpinstall/packager/windows/xpcom.js
@@ -116,7 +116,7 @@ var fileMsvcrt;
var fileMsvcirt;
srDest = 1;
-err = initInstall("Mozilla XPCOM", "XPCOM", "2.1.0.0000000000");
+err = initInstall("Mozilla XPCOM", "XPCOM", "2.2.0.0000000000");
logComment("initInstall: " + err);
fProgram = getFolder("Program");
@@ -137,7 +137,7 @@ if(verifyDiskSpace(fProgram, srDest))
upgradeCleanup();
err = addDirectory("",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
@@ -156,7 +156,7 @@ if(verifyDiskSpace(fProgram, srDest))
{
logComment("File not found: " + fileMsvcrt);
addFile("/Microsoft/Shared/msvcrt.dll",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"msvcrt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fProgram
@@ -178,7 +178,7 @@ if(verifyDiskSpace(fProgram, srDest))
{
logComment("File not found: " + fileMsvcirt);
addFile("/Microsoft/Shared/msvcirt.dll",
- "2.1.0.0000000000",
+ "2.2.0.0000000000",
"msvcirt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fProgram