[X2Go-Commits] [pale-moon] 02/06: [PALEMOON] Add captive portal preference to the UI. (uplift)

[git-admin at x2go.org]

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

x2go pushed a commit to branch upstream/palemoon-master
in repository pale-moon.

commit 3aac95141154dde26268e0114486f5620717bb68
Author: wolfbeast <mcwerewolf at wolfbeast.com>
Date:   Wed Jan 16 01:57:41 2019 +0100

    [PALEMOON] Add captive portal preference to the UI. (uplift)
    
    Tag #860
---
 application/palemoon/components/preferences/advanced.xul     | 12 ++++++++++++
 .../locales/en-US/chrome/browser/preferences/advanced.dtd    |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/application/palemoon/components/preferences/advanced.xul b/application/palemoon/components/preferences/advanced.xul
index 3bd5bec..7fa14f2 100644
--- a/application/palemoon/components/preferences/advanced.xul
+++ b/application/palemoon/components/preferences/advanced.xul
@@ -51,6 +51,8 @@
                   type="bool"/>
 #endif
       <preference id="pref.general.compatmode" name="general.useragent.compatMode"        type="int"/>
+      
+      <preference id="pref.general.captiveportal" name="network.captive-portal-service.enabled" type="bool"/>
 
       <!-- Data Choices tab -->
 
@@ -193,6 +195,7 @@
             </hbox>
           </groupbox>
 #endif
+          <!-- User Agent compatibility -->
           <groupbox id="UACompatGroup" orient="vertical">
             <caption label="&UACompatGroup.label;"/>
             <hbox align="center">
@@ -206,6 +209,15 @@
                 </menulist>
             </hbox>
           </groupbox>
+          
+          <!-- Captive portal detection -->
+          <groupbox id="captivePortalGroup" orient="vertical">
+            <caption label="&captivePortalGroup.label;"/>
+            <checkbox id="captivePortalDetect"
+                      label="&captivePortalDetect.label;"
+                      preference="pref.general.captiveportal"/>
+          </groupbox>
+          
         </tabpanel>
 
         <!-- Network -->
diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
index f8203c6..dcb7b0e 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -39,6 +39,9 @@
 <!ENTITY UACompat.Gecko                  "Gecko Compatibility">
 <!ENTITY UACompat.Firefox                "Firefox Compatibility">
 
+<!ENTITY captivePortalGroup.label        "Captive portals">
+<!ENTITY captivePortalDetect.label       "Detect restricted network access">
+
 <!ENTITY dataChoicesTab.label            "Data Choices">
 
 <!ENTITY crashReporterSection.label      "Crash Reporter">

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git