Merge m-c to inbound.

This commit is contained in:
Ryan VanderMeulen 2012-09-25 17:31:00 -04:00
commit afd4f0c71e

View File

@ -505,6 +505,9 @@ 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)