From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 06:49:42 +0000 (+0000)
Subject: 2002/08/07 04:36:04
X-Git-Tag: RC3~1587
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=41e65987aba045364b1203467a403a3b8d3a5ab7

2002/08/07 04:36:04

darcs-hash:20040130064942-2ba56-92b6f39b8975113c68ef761abc7686ad9aa9a10e.gz
---

diff --git a/CHANGES b/CHANGES
index 1a76e18..8804102 100644
--- a/CHANGES
+++ b/CHANGES
@@ -337,3 +337,5 @@
 06-Jul megacz Java12.java: disabled focusmanager so we can recieve tab
               keypresses.
 
+06-Jul megacz Win32.java: HTTP.ProxyInfo => Proxy
+
diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index 5485540..6a74222 100644
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -123,7 +123,7 @@ public class Win32 extends GCJ {
 
     private native void __detectProxy(String[] container);
 
-    protected synchronized HTTP.ProxyInfo _detectProxy() {
+    protected synchronized Proxy _detectProxy() {
 
         String[] container = new String[] { null, null, null };
         if (Log.on) Log.log(this, "accessing Win32 registry");
@@ -137,9 +137,9 @@ public class Win32 extends GCJ {
         if (Log.on) Log.log(this, "Proxy Server String: " + container[0]);
         if (Log.on) Log.log(this, "Proxy Override String: " + container[1]);
 
-        HTTP.ProxyInfo ret = new HTTP.ProxyInfo();
+        Proxy ret = new Proxy();
         if (container[2] != null) {
-            ret.proxyAutoConfigFunction = HTTP.ProxyInfo.getProxyAutoConfigFunction(container[2]);
+            ret.proxyAutoConfigFunction = Proxy.getProxyAutoConfigFunction(container[2]);
             if (ret.proxyAutoConfigFunction != null) return ret;
         }