From e02f728badd42439ea285eb91d279f4db8a4a6b0 Mon Sep 17 00:00:00 2001 From: "reed%reedloden.com" Date: Wed, 27 Feb 2008 10:13:01 +0000 Subject: [PATCH] Bug 416274 - "Add UI for System Proxy Settings and use the system proxy by default" [p=ventnor.bugzilla@yahoo.com.au (Michael Ventnor) r=gavin ui-r=mconnor a1.9=beltzner] git-svn-id: svn://10.0.0.236/trunk@246663 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/libpref/src/init/all.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mozilla/modules/libpref/src/init/all.js b/mozilla/modules/libpref/src/init/all.js index f93c8cf0619..5b42803c415 100644 --- a/mozilla/modules/libpref/src/init/all.js +++ b/mozilla/modules/libpref/src/init/all.js @@ -763,7 +763,17 @@ pref("network.ntlm.send-lm-response", false); pref("network.hosts.nntp_server", "news.mozilla.org"); pref("permissions.default.image", 1); // 1-Accept, 2-Deny, 3-dontAcceptForeign + +#ifndef XP_MACOSX +#ifdef XP_UNIX +pref("network.proxy.type", 5); +#else pref("network.proxy.type", 0); +#endif +#else +pref("network.proxy.type", 0); +#endif + pref("network.proxy.ftp", ""); pref("network.proxy.ftp_port", 0); pref("network.proxy.gopher", "");