[or-cvs] r10288: [darcs-to-svn @ bypassing Privoxy for Firefoxes <= 1.0 is ne (in torbutton/trunk/src: . chrome/content)

[squires at seul.org]

Author: squires
Date: 2007-05-22 01:28:57 -0400 (Tue, 22 May 2007)
New Revision: 10288

Modified:
   torbutton/trunk/src/CHANGELOG
   torbutton/trunk/src/chrome/content/preferences.js
   torbutton/trunk/src/chrome/content/torbutton.js
Log:
[darcs-to-svn @ bypassing Privoxy for Firefoxes <= 1.0 is never recommended]

Original author: squires at pobox.com
Date: 2006-11-20 05:52:46+00:00

Modified: torbutton/trunk/src/CHANGELOG
===================================================================
--- torbutton/trunk/src/CHANGELOG	2007-05-22 05:28:41 UTC (rev 10287)
+++ torbutton/trunk/src/CHANGELOG	2007-05-22 05:28:57 UTC (rev 10288)
@@ -4,6 +4,7 @@
   * bugfix: set the toolbar button to the correct state upon insertion into 
             the toolbar (ff >= 1.5 only)
   * bugfix: clarify the wording of the one-liner extension description
+  * bugfix: bypassing privoxy with Firefox <= 1.0 is not recommended
   * misc: new icons
   * misc: keyboard shortcut re-assigned to ctrl-2
   * new: previous proxy settings are restored after exiting tor mode

Modified: torbutton/trunk/src/chrome/content/preferences.js
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.js	2007-05-22 05:28:41 UTC (rev 10287)
+++ torbutton/trunk/src/chrome/content/preferences.js	2007-05-22 05:28:57 UTC (rev 10288)
@@ -12,7 +12,13 @@
     doc.getElementById('torbutton_panelStyle').setAttribute("disabled", !doc.getElementById('torbutton_displayStatusPanel').checked);
     doc.getElementById('torbutton_panelStyleText').setAttribute("disabled", !doc.getElementById('torbutton_displayStatusPanel').checked);
     doc.getElementById('torbutton_panelStyleIcon').setAttribute("disabled", !doc.getElementById('torbutton_displayStatusPanel').checked);
-    doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", doc.getElementById('torbutton_settingsMethod').value != 'recommended');
+    // Privoxy is always recommended for Firefoxes not support socks_remote_dns
+    if (!torbutton_check_socks_remote_dns())
+    {
+      doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", true);
+    } else {
+      doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", doc.getElementById('torbutton_settingsMethod').value != 'recommended');
+    }
     var proxy_port;
     var proxy_host;
     if (doc.getElementById('torbutton_usePrivoxy').checked)

Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2007-05-22 05:28:41 UTC (rev 10287)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2007-05-22 05:28:57 UTC (rev 10288)
@@ -217,6 +217,10 @@
     torbutton_log(4, "called init_prefs()");
     torprefs = torbutton_get_prefbranch('extensions.torbutton.');
 
+    // Privoxy is always recommended for Firefoxes not supporting socks_remote_dns
+    if (!torbutton_check_socks_remote_dns())
+        torprefs.setBoolPref('use_privoxy', true);
+
     if (torprefs.getBoolPref('use_privoxy'))
     {
         proxy_host = 'localhost';