[or-cvs] r10289: [darcs-to-svn @ correct a regression involving preference na (torbutton/trunk/src/chrome/content)

[squires@xxxxxxxx]

Author: squires
Date: 2007-05-22 01:29:04 -0400 (Tue, 22 May 2007)
New Revision: 10289

Modified:
   torbutton/trunk/src/chrome/content/torbutton.js
Log:
[darcs-to-svn @ correct a regression involving preference names]
Some code refactoring during the 1.0.5 development led to a situation where the initial proxy settings chosen by Torbutton upon installation were wrong, but were corrected as soon as the user opened the preference dialog.

Original author: squires@xxxxxxxxx
Date: 2006-11-20 06:19:43+00:00

Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2007-05-22 05:28:57 UTC (rev 10288)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2007-05-22 05:29:04 UTC (rev 10289)
@@ -237,21 +237,21 @@
         torbutton_log(5, "using recommended settings");
         if (torbutton_check_socks_remote_dns())
         {
-            torprefs.setCharPref('http', proxy_host);
-            torprefs.setCharPref('ssl', proxy_host);
-            torprefs.setCharPref('ftp', '');
-            torprefs.setCharPref('gopher', '');
+            torprefs.setCharPref('http_proxy', proxy_host);
+            torprefs.setCharPref('https_proxy', proxy_host);
+            torprefs.setCharPref('ftp_proxy', '');
+            torprefs.setCharPref('gopher_proxy', '');
             torprefs.setIntPref('http_port', proxy_port);
-            torprefs.setIntPref('ssl_port', proxy_port);
+            torprefs.setIntPref('https_port', proxy_port);
             torprefs.setIntPref('ftp_port', 0);
             torprefs.setIntPref('gopher_port', 0);
         } else {
-            torprefs.setCharPref('http', proxy_host);
-            torprefs.setCharPref('ssl', proxy_host);
-            torprefs.setCharPref('ftp', proxy_host);
-            torprefs.setCharPref('gopher', proxy_host);
+            torprefs.setCharPref('http_proxy', proxy_host);
+            torprefs.setCharPref('https_proxy', proxy_host);
+            torprefs.setCharPref('ftp_proxy', proxy_host);
+            torprefs.setCharPref('gopher_proxy', proxy_host);
             torprefs.setIntPref('http_port', proxy_port);
-            torprefs.setIntPref('ssl_port', proxy_port);
+            torprefs.setIntPref('https_port', proxy_port);
             torprefs.setIntPref('ftp_port', proxy_port);
             torprefs.setIntPref('gopher_port', proxy_port);
         }