[X2Go-Commits] [pale-moon] 88/102: Move "No proxy for" control down to clarify it is a global effect.

git-admin at x2go.org git-admin at x2go.org
Mon Feb 25 23:25:56 CET 2019


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

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

commit 48d8e28fe6f4957a423ab609a0adcb878c8abddb
Author: wolfbeast <mcwerewolf at wolfbeast.com>
Date:   Thu Feb 14 01:54:58 2019 +0100

    Move "No proxy for" control down to clarify it is a global effect.
    
    Follow-up to the behavior change in commit
    6567bb631a78033b6b4cc32bc93e07d837652276
---
 application/basilisk/components/preferences/connection.xul | 6 +++---
 application/palemoon/components/preferences/connection.xul | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/basilisk/components/preferences/connection.xul b/application/basilisk/components/preferences/connection.xul
index a3f0d08..1eb0c15 100644
--- a/application/basilisk/components/preferences/connection.xul
+++ b/application/basilisk/components/preferences/connection.xul
@@ -145,9 +145,6 @@
               </radiogroup>
               </box>
             </row>
-            <label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/>
-            <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/>
-            <label value="&noproxyExplain.label;" control="networkProxyNone"/>
           </rows>
         </grid>
         <radio value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;"/>
@@ -162,6 +159,9 @@
       </radiogroup>
     </groupbox>
     <separator class="thin"/>
+    <label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/>
+    <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/>
+    <label value="&noproxyExplain.label;" control="networkProxyNone"/>
     <checkbox id="autologinProxy"
               label="&autologinproxy.label;"
               accesskey="&autologinproxy.accesskey;"
diff --git a/application/palemoon/components/preferences/connection.xul b/application/palemoon/components/preferences/connection.xul
index 491bf48..e6079dd 100644
--- a/application/palemoon/components/preferences/connection.xul
+++ b/application/palemoon/components/preferences/connection.xul
@@ -138,9 +138,6 @@
                 <radio id="networkProxySOCKSVersion5" value="5" label="&socks5.label;" accesskey="&socks5.accesskey;"/>
               </radiogroup>
             </row>
-            <label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/>
-            <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/>
-            <label value="&noproxyExplain.label;" control="networkProxyNone"/>
           </rows>
         </grid>
         <radio value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;"/>
@@ -154,6 +151,9 @@
         </hbox>
       </radiogroup>
       <separator class="thin"/>
+      <label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/>
+      <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/>
+      <label value="&noproxyExplain.label;" control="networkProxyNone"/>
       <checkbox id="autologinProxy" preference="signon.autologin.proxy"
                 label="&autologinproxy.label;" accesskey="&autologinproxy.accesskey;"
                 tooltiptext="&autologinproxy.tooltip;"/>

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


More information about the x2go-commits mailing list