[tor-commits] [tor-browser] 09/10: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

[gitolite role via tor-commits <tor-commits@xxxxxxxxxxxxxxxxxxxx>]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-102.3.0esr-12.0-2
in repository tor-browser.

commit 91abcc7a6a7f2204ae4e97a0b591afc51adc6624
Author: Pier Angelo Vendrame <pierov@xxxxxxxxxxxxxx>
AuthorDate: Mon Oct 10 15:20:56 2022 +0200

    fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
    
    Bug 40933: Move tor-launcher to tor-browser.git
---
 browser/components/torpreferences/content/connectionPane.js | 11 +++++++----
 browser/components/torpreferences/content/torLogDialog.jsm  |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js
index d89f42ca7613..c1a069c8cd49 100644
--- a/browser/components/torpreferences/content/connectionPane.js
+++ b/browser/components/torpreferences/content/connectionPane.js
@@ -13,8 +13,11 @@ const {
   TorBridgeSource,
 } = ChromeUtils.import("resource:///modules/TorSettings.jsm");
 
+const { TorMonitorService } = ChromeUtils.import(
+  "resource://gre/modules/TorMonitorService.jsm"
+);
 const { TorProtocolService } = ChromeUtils.import(
-  "resource:///modules/TorProtocolService.jsm"
+  "resource://gre/modules/TorProtocolService.jsm"
 );
 
 const {
@@ -198,7 +201,7 @@ const gConnectionPane = (function() {
           TorConnect.state === TorConnectState.Configuring
         ) {
           // set messagebox style and text
-          if (TorProtocolService.torBootstrapErrorOccurred()) {
+          if (TorMonitorService.bootstrapErrorOccurred) {
             messageBox.parentNode.style.display = null;
             messageBox.className = "error";
             messageBoxMessage.innerText = TorStrings.torConnect.tryAgainMessage;
@@ -396,7 +399,7 @@ const gConnectionPane = (function() {
         this._showAutoconfiguration = () => {
           if (
             !TorConnect.shouldShowTorConnect ||
-            !TorProtocolService.torBootstrapErrorOccurred()
+            !TorMonitorService.bootstrapErrorOccurred
           ) {
             locationGroup.setAttribute("hidden", "true");
             return;
@@ -945,7 +948,7 @@ const gConnectionPane = (function() {
 
     // whether the page should be present in about:preferences
     get enabled() {
-      return TorProtocolService.ownsTorDaemon;
+      return TorMonitorService.ownsTorDaemon;
     },
 
     //
diff --git a/browser/components/torpreferences/content/torLogDialog.jsm b/browser/components/torpreferences/content/torLogDialog.jsm
index 94a57b9b165e..bf50cb801e10 100644
--- a/browser/components/torpreferences/content/torLogDialog.jsm
+++ b/browser/components/torpreferences/content/torLogDialog.jsm
@@ -6,8 +6,8 @@ const { setTimeout, clearTimeout } = ChromeUtils.import(
   "resource://gre/modules/Timer.jsm"
 );
 
-const { TorProtocolService } = ChromeUtils.import(
-  "resource:///modules/TorProtocolService.jsm"
+const { TorMonitorService } = ChromeUtils.import(
+  "resource://gre/modules/TorMonitorService.jsm"
 );
 const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");
 
@@ -56,7 +56,7 @@ class TorLogDialog {
       }, RESTORE_TIME);
     });
 
-    this._logTextarea.value = TorProtocolService.getLog();
+    this._logTextarea.value = TorMonitorService.getLog();
   }
 
   init(window, aDialog) {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits