[or-cvs] r10279: [darcs-to-svn @ ff 0.9 doesn't have network.proxy.share_prox (torbutton/trunk/src/chrome/content)

[squires at seul.org]

Author: squires
Date: 2007-05-22 01:26:48 -0400 (Tue, 22 May 2007)
New Revision: 10279

Modified:
   torbutton/trunk/src/chrome/content/torbutton.js
Log:
[darcs-to-svn @ ff 0.9 doesn't have network.proxy.share_proxy_settings]

Original author: squires at pobox.com
Date: 2006-10-29 00:29:32+00:00

Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2007-05-22 05:26:33 UTC (rev 10278)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2007-05-22 05:26:48 UTC (rev 10279)
@@ -347,9 +347,11 @@
   savprefs.setCharPref('socks_host',   nonprefs.getCharPref('socks'));
   savprefs.setIntPref('socks_port',    nonprefs.getIntPref('socks_port'));
   savprefs.setIntPref('socks_version', nonprefs.getIntPref('socks_version'));
-  savprefs.setBoolPref('share_proxy_settings', nonprefs.getBoolPref('share_proxy_settings'));
+  try { // ff-0.9 doesn't have share_proxy_settings
+    savprefs.setBoolPref('share_proxy_settings', nonprefs.getBoolPref('share_proxy_settings'));
+  } catch(e) {}
   if (torbutton_check_socks_remote_dns())
-    savprefs.setBoolPref('socks_remote_dns',   nonprefs.getBoolPref('socks_remote_dns'));
+    savprefs.setBoolPref('socks_remote_dns',     nonprefs.getBoolPref('socks_remote_dns'));
 }
 
 function torbutton_restore_nontor_settings()
@@ -373,9 +375,11 @@
   nonprefs.setCharPref('socks',        savprefs.getCharPref('socks_host'));
   nonprefs.setIntPref('socks_port',    savprefs.getIntPref('socks_port'));
   nonprefs.setIntPref('socks_version', savprefs.getIntPref('socks_version'));
-  nonprefs.setBoolPref('share_proxy_settings', savprefs.getBoolPref('share_proxy_settings'));
+  try { // ff-0.9 doesn't have share_proxy_settings
+    nonprefs.setBoolPref('share_proxy_settings', savprefs.getBoolPref('share_proxy_settings'));
+  } catch(e) {}
   if (torbutton_check_socks_remote_dns())
-    nonprefs.setBoolPref('socks_remote_dns',   savprefs.getBoolPref('socks_remote_dns'));
+    nonprefs.setBoolPref('socks_remote_dns',     savprefs.getBoolPref('socks_remote_dns'));
 }
 
 function torbutton_disable_tor()