[gnome-shell/gnome-3-24] portalHelper: Don't go through proxies for captive portals

[Michael Catanzaro <mcatanzaro src gnome org>]

commit d104ebf6120a9396df4977763ebaf3624deeb6cb
Author: Bastien Nocera <hadess hadess net>
Date:   Thu May 18 18:13:12 2017 +0200

    portalHelper: Don't go through proxies for captive portals
    
    When using an SSH tunnel (through a SOCKS proxy) to funnel all
    the outgoing traffic, we need the captive portal to not go through that
    proxy, otherwise we can't go through the proxy because we're not
    connected to the Internet and we can't go through the portal because
    we're not connected through the proxy.
    
    This fixes a blank captive portal window and no error reporting in that
    particular configuration.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769692

 js/portalHelper/main.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js
index b721f6a..39e0c2b 100644
--- a/js/portalHelper/main.js
+++ b/js/portalHelper/main.js
@@ -143,6 +143,7 @@ const PortalWindow = new Lang.Class({
 
         this._webContext = WebKit.WebContext.new_ephemeral();
         this._webContext.set_cache_model(WebKit.CacheModel.DOCUMENT_VIEWER);
+        this._webContext.set_network_proxy_settings(WebKit.NetworkProxyMode.NO_PROXY, null);
 
         this._webView = WebKit.WebView.new_with_context(this._webContext);
         this._webView.connect('decide-policy', Lang.bind(this, this._onDecidePolicy));