Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 25 Sep 2012 17:31:00 -0400
changeset 108172 bbbd07f4cadce95ae8127c6c5d3acf9074dfc191
parent 108171 aebc8d0fc3a102ce6a888445cdaf43c27ab4eb2b (current diff)
parent 108136 a1e7318fabc5155a997683bf02574882a9376f25 (diff)
child 108173 e9f40f834e8de005bdbdda0980c967efa6b9ae8f
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
milestone18.0a1
Merge m-c to inbound.
build/automation.py.in
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -500,16 +500,19 @@ function FindProxyForURL(url, host)
 
       part += """
 user_pref("network.proxy.type", 2);
 user_pref("network.proxy.autoconfig_url", "%(pacURL)s");
 
 user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless to others
 """ % {"pacURL": pacURL}
       prefs.append(part)
+    else:
+      part = 'user_pref("network.proxy.type", 0);\n'
+      prefs.append(part)
 
     for v in extraPrefs:
       thispref = v.split("=", 1)
       if len(thispref) < 2:
         print "Error: syntax error in --setpref=" + v
         sys.exit(1)
       part = 'user_pref("%s", %s);\n' % (thispref[0], thispref[1])
       prefs.append(part)