[Pkg-mozext-commits] [SCM] torbutton Debian packaging branch, master, updated. debian/1.2.2-1
Jérémy Bobbio
lunar at debian.org
Wed Aug 19 23:39:18 UTC 2009
The following commit has been merged in the master branch:
commit 27860b2833b09f15b2ff15ea5830885d5741037a
Merge: 256914bb3194c6f8206c5f30bbe76143a22d4be6 89b4ebceaed0311e4503c9134eb3a9e82e132fe4
Author: Jérémy Bobbio <lunar at debian.org>
Date: Thu Aug 20 00:06:20 2009 +0200
Merge commit 'upstream/1.2.2'
diff --combined src/chrome/content/preferences.js
index fbac66f,57d8c39..b4865e1
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@@ -23,7 -23,7 +23,7 @@@ function torbutton_prefs_set_field_attr
var proxy_port;
var proxy_host;
if (doc.getElementById('torbutton_usePrivoxy').checked) {
- proxy_host = '127.0.0.1';
+ proxy_host = 'localhost';
proxy_port = 8118;
} else {
proxy_host = '';
@@@ -66,6 -66,7 +66,7 @@@
doc.getElementById('torbutton_socksHost').disabled = true;
doc.getElementById('torbutton_socksPort').disabled = true;
doc.getElementById('torbutton_socksGroup').disabled = true;
+ doc.getElementById('torbutton_noProxiesOn').disabled = true;
} else {
doc.getElementById('torbutton_httpProxy').disabled = false;
doc.getElementById('torbutton_httpPort').disabled = false;
@@@ -78,6 -79,7 +79,7 @@@
doc.getElementById('torbutton_socksHost').disabled = false;
doc.getElementById('torbutton_socksPort').disabled = false;
doc.getElementById('torbutton_socksGroup').disabled = false;
+ doc.getElementById('torbutton_noProxiesOn').disabled = false;
/* Do not reset these on every document update..
doc.getElementById('torbutton_httpProxy').value = o_customprefs.getCharPref('http_proxy');
doc.getElementById('torbutton_httpPort').value = o_customprefs.getIntPref('http_port');
@@@ -138,6 -140,8 +140,8 @@@ function torbutton_prefs_init(doc)
doc.getElementById('torbutton_socksGroup').selectedItem =
doc.getElementById('torbutton_socksv5');
}
+ doc.getElementById('torbutton_noProxiesOn').value = o_torprefs.getCharPref('no_proxies_on');
+
// doc.getElementById('torbutton_warnUponExcludedSite').checked = o_torprefs.getBoolPref('prompt_before_visiting_excluded_sites');
doc.getElementById('torbutton_disablePlugins').checked = o_torprefs.getBoolPref('no_tor_plugins');
@@@ -330,6 -334,8 +334,8 @@@ function torbutton_prefs_save(doc)
o_torprefs.setIntPref('socks_version', 5);
}
+ o_torprefs.setCharPref('no_proxies_on', doc.getElementById('torbutton_noProxiesOn').value);
+
if (doc.getElementById('torbutton_settingsMethod').value == 'custom') {
// XXX: Is this even needed anymore? We don't read the
// custom prefs at all it seems..
diff --combined src/chrome/content/torbutton.js
index 24370eb,6d9e705..677c881
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@@ -97,7 -97,7 +97,7 @@@ var torbutton_unique_pref_observer
|| !m_tb_prefs.prefHasUserValue("general.useragent.vendorSub"))
&& m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled")
&& m_tb_prefs.getBoolPref("extensions.torbutton.set_uagent")) {
- torbutton_log(4, "Some other addond tried to clear user agent settings.");
+ torbutton_log(4, "Some other addon tried to clear user agent settings.");
torbutton_set_uagent();
}
break;
@@@ -449,7 -449,7 +449,7 @@@ function torbutton_init_prefs()
if (torprefs.getBoolPref('use_privoxy'))
{
- proxy_host = '127.0.0.1';
+ proxy_host = 'localhost';
proxy_port = 8118;
}
else
@@@ -554,6 -554,7 +554,7 @@@ function torbutton_save_nontor_settings
savprefs.setCharPref('socks_host', liveprefs.getCharPref('socks'));
savprefs.setIntPref('socks_port', liveprefs.getIntPref('socks_port'));
savprefs.setIntPref('socks_version', liveprefs.getIntPref('socks_version'));
+ savprefs.setCharPref('no_proxies_on', liveprefs.getCharPref('no_proxies_on'));
try { // ff-0.9 doesn't have share_proxy_settings
savprefs.setBoolPref('share_proxy_settings', liveprefs.getBoolPref('share_proxy_settings'));
} catch(e) {}
@@@ -592,6 -593,7 +593,7 @@@ function torbutton_restore_nontor_setti
liveprefs.setCharPref('socks', savprefs.getCharPref('socks_host'));
liveprefs.setIntPref('socks_port', savprefs.getIntPref('socks_port'));
liveprefs.setIntPref('socks_version', savprefs.getIntPref('socks_version'));
+ liveprefs.setCharPref('no_proxies_on',savprefs.getCharPref('no_proxies_on'));
try { // ff-0.9 doesn't have share_proxy_settings
liveprefs.setBoolPref('share_proxy_settings', savprefs.getBoolPref('share_proxy_settings'));
} catch(e) {}
@@@ -722,6 -724,8 +724,8 @@@ function torbutton_update_statusbar(mod
var o_statuspanel = torbutton_get_statuspanel();
if (!window.statusbar.visible) return;
var o_stringbundle = torbutton_get_stringbundle();
+ var label = "";
+ var tooltip = "";
if (mode) {
label = o_stringbundle.GetStringFromName("torbutton.panel.label.enabled");
@@@ -740,63 -744,88 +744,88 @@@
}
}
+ // XXX: Hrmm, this may not always be called with ints (see bug 1006).
+ // Possibly because some other addon sets odd values for a pref
+ // that can be either int or char? Can maybe just wrap in try block
+ // for now.
function torbutton_setIntPref(pref, save, val, mode, changed) {
if(!changed) return; // Handle the pref change cases via observers
- if(mode) {
- if(m_tb_prefs.prefHasUserValue(pref)) {
- m_tb_prefs.setIntPref("extensions.torbutton.saved."+save,
- m_tb_prefs.getIntPref(pref));
- } else if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
- m_tb_prefs.clearUserPref("extensions.torbutton.saved."+save);
- }
- m_tb_prefs.setIntPref(pref, val);
- } else {
- if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
- m_tb_prefs.setIntPref(pref,
- m_tb_prefs.getIntPref("extensions.torbutton.saved."+save));
- } else if(m_tb_prefs.prefHasUserValue(pref)) {
- m_tb_prefs.clearUserPref(pref);
+ try {
+ if(mode) {
+ if(m_tb_prefs.prefHasUserValue(pref)) {
+ m_tb_prefs.setIntPref("extensions.torbutton.saved."+save,
+ m_tb_prefs.getIntPref(pref));
+ } else if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
+ m_tb_prefs.clearUserPref("extensions.torbutton.saved."+save);
+ }
+ m_tb_prefs.setIntPref(pref, val);
+ } else {
+ if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
+ m_tb_prefs.setIntPref(pref,
+ m_tb_prefs.getIntPref("extensions.torbutton.saved."+save));
+ } else if(m_tb_prefs.prefHasUserValue(pref)) {
+ m_tb_prefs.clearUserPref(pref);
+ }
}
+ } catch(e) {
+ var msg = "Torbutton BUG: torbutton_setIntPref failed for "+pref
+ +"/"+save+" to value "+val+": "+e;
+ torbutton_log(5, msg);
+ window.alert(msg);
}
}
function torbutton_setCharPref(pref, save, val, mode, changed) {
if(!changed) return; // Handle the pref change cases via observers
- if(mode) {
- if(m_tb_prefs.prefHasUserValue(pref)) {
- m_tb_prefs.setCharPref("extensions.torbutton.saved."+save,
- m_tb_prefs.getCharPref(pref));
- } else if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
- m_tb_prefs.clearUserPref("extensions.torbutton.saved."+save);
- }
- m_tb_prefs.setCharPref(pref, val);
- } else {
- if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
- m_tb_prefs.setCharPref(pref,
- m_tb_prefs.getCharPref("extensions.torbutton.saved."+save));
- } else if(m_tb_prefs.prefHasUserValue(pref)) {
- m_tb_prefs.clearUserPref(pref);
+ try {
+ if(mode) {
+ if(m_tb_prefs.prefHasUserValue(pref)) {
+ m_tb_prefs.setCharPref("extensions.torbutton.saved."+save,
+ m_tb_prefs.getCharPref(pref));
+ } else if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
+ m_tb_prefs.clearUserPref("extensions.torbutton.saved."+save);
+ }
+ m_tb_prefs.setCharPref(pref, val);
+ } else {
+ if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
+ m_tb_prefs.setCharPref(pref,
+ m_tb_prefs.getCharPref("extensions.torbutton.saved."+save));
+ } else if(m_tb_prefs.prefHasUserValue(pref)) {
+ m_tb_prefs.clearUserPref(pref);
+ }
}
+ } catch(e) {
+ var msg = "Torbutton BUG: torbutton_setCharPref failed for "+pref
+ +"/"+save+" to value "+val+": "+e;
+ torbutton_log(5, msg);
+ window.alert(msg);
}
}
function torbutton_setBoolPref(pref, save, val, mode, changed) {
if(!changed) return; // Handle the pref change cases via observers
- if(mode) {
- if(m_tb_prefs.prefHasUserValue(pref)) {
- m_tb_prefs.setBoolPref("extensions.torbutton.saved."+save,
- m_tb_prefs.getBoolPref(pref));
- } else if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
- m_tb_prefs.clearUserPref("extensions.torbutton.saved."+save);
- }
- m_tb_prefs.setBoolPref(pref, val);
- } else {
- if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
- m_tb_prefs.setBoolPref(pref,
- m_tb_prefs.getBoolPref("extensions.torbutton.saved."+save));
- } else if(m_tb_prefs.prefHasUserValue(pref)) {
- m_tb_prefs.clearUserPref(pref);
+ try {
+ if(mode) {
+ if(m_tb_prefs.prefHasUserValue(pref)) {
+ m_tb_prefs.setBoolPref("extensions.torbutton.saved."+save,
+ m_tb_prefs.getBoolPref(pref));
+ } else if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
+ m_tb_prefs.clearUserPref("extensions.torbutton.saved."+save);
+ }
+ m_tb_prefs.setBoolPref(pref, val);
+ } else {
+ if(m_tb_prefs.prefHasUserValue("extensions.torbutton.saved."+save)) {
+ m_tb_prefs.setBoolPref(pref,
+ m_tb_prefs.getBoolPref("extensions.torbutton.saved."+save));
+ } else if(m_tb_prefs.prefHasUserValue(pref)) {
+ m_tb_prefs.clearUserPref(pref);
+ }
}
+ } catch(e) {
+ var msg = "Torbutton BUG: torbutton_setBoolPref failed for "+pref
+ +"/"+save+" to value "+val+": "+e;
+ torbutton_log(5, msg);
+ window.alert(msg);
}
}
@@@ -841,7 -870,7 +870,7 @@@ function torbutton_set_timezone(mode, s
// Regex match for 3 letter code
var re = new RegExp('\\((\\S+)\\)', "gm");
- match = re.exec(d.toString());
+ var match = re.exec(d.toString());
// Parse parens. If parseable, use. Otherwise set TZ=""
var set = ""
if(match) {
@@@ -1211,6 -1240,11 +1240,11 @@@ function torbutton_update_status(mode,
m_tb_prefs.setBoolPref("security.enable_ssl2",
!m_tb_prefs.getBoolPref("security.enable_ssl2"));
+ // This clears the undo tab history.
+ var tabs = m_tb_prefs.getIntPref("browser.sessionstore.max_tabs_undo");
+ m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", 0);
+ m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", tabs);
+
var lp = m_tb_prefs.getIntPref("network.cookie.lifetimePolicy");
if(lp == 1) {
@@@ -2242,6 -2276,40 +2276,40 @@@ unregister : function()
}
}
+ var torbutton_proxyservice = {
+ applyFilter : function(ps, uri, proxy) {
+ try {
+ torbutton_eclog(3, 'apply: '+uri.host+' '+uri.scheme+', '+proxy);
+ if (m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled")) {
+ if (uri.host == "localhost") return null;
+ }
+ return proxy;
+ }
+ catch (e) {
+ torbutton_eclog(3, 'applyFilter failed:' +e);
+ }
+ },
+ register : function() {
+ torbutton_eclog(3, 'Proxy filter Registering...');
+ try {
+ var proxyservice = Components.classes["@mozilla.org/network/protocol-proxy-service;1"]
+ .getService(Components.interfaces.nsIProtocolProxyService);
+ proxyservice.registerFilter(this, 0);
+ } catch (e) {
+ torbutton_eclog(3, 'RegisterFilter failed:'+e);
+ }
+ },
+ unregister : function() {
+ torbutton_eclog(3, 'Proxy filter Unregistering...');
+ try {
+ var proxyservice = Components.classes["@mozilla.org/network/protocol-proxy-service;1"]
+ .getService(Components.interfaces.nsIProtocolProxyService);
+ proxyservice.unregisterFilter(this, 0);
+ } catch (e) {
+ torbutton_eclog(3, 'UnregisterFilter failed:'+e);
+ }
+ }
+ }
function torbutton_do_main_window_startup()
{
@@@ -2262,6 -2330,7 +2330,7 @@@
torbutton_unique_pref_observer.register();
torbutton_uninstall_observer.register();
torbutton_http_observer.register();
+ torbutton_proxyservice.register();
}
function torbutton_set_initial_state() {
@@@ -2525,6 -2594,7 +2594,7 @@@ function torbutton_close_window(event)
torbutton_unique_pref_observer.unregister();
torbutton_uninstall_observer.unregister();
torbutton_http_observer.unregister();
+ torbutton_proxyservice.unregister();
if(m_tb_is_main_window) { // main window not reset above
// This happens on Mac OS because they allow firefox
@@@ -2960,7 -3030,9 +3030,9 @@@ function torbutton_check_progress(aProg
if(doc && doc.location &&
(doc.location.href.indexOf("about:") != 0 &&
doc.location.href.indexOf("chrome:") != 0)) {
- torbutton_eclog(4, "Exception on tag application at "+doc.location+": "+e);
+ torbutton_safelog(4, "Exception "+e
+ +" on tag application at: ",
+ doc.location);
} else {
torbutton_eclog(3, "Got an about url: "+e);
}
--
torbutton Debian packaging
More information about the Pkg-mozext-commits
mailing list