commit de405aee1a4e5c848905b9f52bccc2764cdbb8c7 Author: Alex Catarineu acat@torproject.org Date: Thu Apr 9 12:53:27 2020 +0200

Bug 33890: Rename xul files to xhtml --- src/chrome/content/{localePicker.xul => localePicker.xhtml} | 0 .../{network-settings-wizard.xul => network-settings-wizard.xhtml} | 0 src/chrome/content/{network-settings.xul => network-settings.xhtml} | 0 src/components/tl-process.js | 6 +++--- src/install.rdf | 3 --- 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/chrome/content/localePicker.xul b/src/chrome/content/localePicker.xhtml similarity index 100% rename from src/chrome/content/localePicker.xul rename to src/chrome/content/localePicker.xhtml diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xhtml similarity index 100% rename from src/chrome/content/network-settings-wizard.xul rename to src/chrome/content/network-settings-wizard.xhtml diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xhtml similarity index 100% rename from src/chrome/content/network-settings.xul rename to src/chrome/content/network-settings.xhtml diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 1cad103..31f6801 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -722,7 +722,7 @@ TorProcessService.prototype =

_openLocalePicker: function() { - const kLocalePickerURL = "chrome://torlauncher/content/localePicker.xul"; + const kLocalePickerURL = "chrome://torlauncher/content/localePicker.xhtml";

var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"] .getService(Ci.nsIWindowWatcher); @@ -743,8 +743,8 @@ TorProcessService.prototype = return; }

- const kSettingsURL = "chrome://torlauncher/content/network-settings.xul"; - const kWizardURL = "chrome://torlauncher/content/network-settings-wizard.xul"; + const kSettingsURL = "chrome://torlauncher/content/network-settings.xhtml"; + const kWizardURL = "chrome://torlauncher/content/network-settings-wizard.xhtml";

var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"] .getService(Ci.nsIWindowWatcher); diff --git a/src/install.rdf b/src/install.rdf index 919d5e8..571b8c5 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -12,9 +12,6 @@ em:homepageURLhttps://www.torproject.org/projects/torbrowser.html</em:homepageURL> em:updateURLdata:text/plain,</em:updateURL> em:updateKey-</em:updateKey> -<!-- - em:optionsURLchrome://torlauncher/content/preferences.xul</em:optionsURL> ---> <!-- firefox --> em:targetApplication <Description>