Mercurial Repositories > eric / file diff

diff -r 9718755def80 -r a67fee7bc09c WebBrowser/Network/NetworkManager.py
--- a/WebBrowser/Network/NetworkManager.py	Wed Dec 12 19:43:53 2018 +0100
+++ b/WebBrowser/Network/NetworkManager.py	Wed Dec 12 19:52:24 2018 +0100
@@ -50,16 +50,15 @@
         """
         super(NetworkManager, self).__init__(parent)
         
-        if not WebBrowserWindow._fromEric:
-            from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory
-            
-            self.__proxyFactory = E5NetworkProxyFactory()
-            if Preferences.getUI("UseSystemProxy"):
-                QNetworkProxyFactory.setUseSystemConfiguration(True)
-            else:
-                QNetworkProxyFactory.setApplicationProxyFactory(
-                    self.__proxyFactory)
-                QNetworkProxyFactory.setUseSystemConfiguration(False)
+        from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory
+        
+        self.__proxyFactory = E5NetworkProxyFactory()
+        if Preferences.getUI("UseSystemProxy"):
+            QNetworkProxyFactory.setUseSystemConfiguration(True)
+        else:
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                self.__proxyFactory)
+            QNetworkProxyFactory.setUseSystemConfiguration(False)
         
         self.languagesChanged()
         
@@ -340,13 +339,12 @@
         """
         self.__interceptor.preferencesChanged()
             
-        if not WebBrowserWindow._fromEric:
-            if Preferences.getUI("UseSystemProxy"):
-                QNetworkProxyFactory.setUseSystemConfiguration(True)
-            else:
-                QNetworkProxyFactory.setApplicationProxyFactory(
-                    self.__proxyFactory)
-                QNetworkProxyFactory.setUseSystemConfiguration(False)
+        if Preferences.getUI("UseSystemProxy"):
+            QNetworkProxyFactory.setUseSystemConfiguration(True)
+        else:
+            QNetworkProxyFactory.setApplicationProxyFactory(
+                self.__proxyFactory)
+            QNetworkProxyFactory.setUseSystemConfiguration(False)
     
     def createRequest(self, op, request, data):
         """