GitLab

at 2025-08-13T12:39:38+02:00

fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

TB 44095: Rename connectionPane.xhtml to .inc.xhtml.

Let's improve consistency.
Also, we need to explicitly enable formatting on this, since .inc.xhtml
files are excluded by default.

@@ -1711,6 +1711,8 @@ xpcom/idl-parser/xpidl/fixtures/xpctest.d.json
  browser/app/profile/001-base-profile.js
  browser/app/profile/000-tor-browser.js
 +# We do not use the preprocessor here, so we can lint it.
 +!browser/components/torpreferences/content/connectionPane.inc.xhtml
  mobile/android/app/000-tor-browser-android.js
  toolkit/content/pt_config.json
  toolkit/content/moat_countries_dev_build.json

@@ -259,7 +259,7 @@
  #include sync.inc.xhtml
  #include experimental.inc.xhtml
  #include moreFromMozilla.inc.xhtml
 -#include ../torpreferences/content/connectionPane.xhtml
 +#include ../torpreferences/content/connectionPane.inc.xhtml
          </vbox>
        </vbox>
      </vbox>

@@ -28,7 +28,6 @@ browser.jar:
      content/browser/torpreferences/torLogDialog.js                   (content/torLogDialog.js)
      content/browser/torpreferences/torLogDialog.xhtml                (content/torLogDialog.xhtml)
      content/browser/torpreferences/connectionPane.js                 (content/connectionPane.js)
 -    content/browser/torpreferences/connectionPane.xhtml              (content/connectionPane.xhtml)
      content/browser/torpreferences/torPreferences.css                (content/torPreferences.css)
      content/browser/torpreferences/bridgemoji/BridgeEmoji.js         (content/bridgemoji/BridgeEmoji.js)
      content/browser/torpreferences/bridgemoji/bridge-emojis.json     (content/bridgemoji/bridge-emojis.json)