projects
/
org.ibex.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
80ee9ef
)
2002/08/07 04:36:04
author
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 06:49:42 +0000
(06:49 +0000)
committer
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 06:49:42 +0000
(06:49 +0000)
darcs-hash:
20040130064942
-2ba56-
92b6f39b8975113c68ef761abc7686ad9aa9a10e
.gz
CHANGES
patch
|
blob
|
history
src/org/xwt/plat/Win32.java
patch
|
blob
|
history
diff --git
a/CHANGES
b/CHANGES
index
1a76e18
..
8804102
100644
(file)
--- a/
CHANGES
+++ b/
CHANGES
@@
-337,3
+337,5
@@
06-Jul megacz Java12.java: disabled focusmanager so we can recieve tab
keypresses.
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
(file)
--- 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);
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");
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]);
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) {
if (container[2] != null) {
- ret.proxyAutoConfigFunction = HTTP.ProxyInfo.getProxyAutoConfigFunction(container[2]);
+ ret.proxyAutoConfigFunction = Proxy.getProxyAutoConfigFunction(container[2]);
if (ret.proxyAutoConfigFunction != null) return ret;
}
if (ret.proxyAutoConfigFunction != null) return ret;
}