February 2013 - tor-commits - lists.torproject.org

[torbutton/master] Reduce some error console noise (slightly).
by mikeperry＠torproject.org 14 Feb '13

14 Feb '13

commit febf6b2cffd2c20abf839b8dc4b8203075490826 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 9 20:28:49 2013 -0800 Reduce some error console noise (slightly). --- src/chrome/content/torbutton.js | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 06e668c..946c613 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1248,8 +1248,11 @@ function torbutton_do_new_identity() { getService(Components.interfaces.imgICache); imgCache.clearCache(false); // evict all but chrome cache } catch(e) { - torbutton_log(5, "Exception on image cache clearing: "+e); - window.alert("Torbutton: Unexpected error during image cache clearing: "+e); + // FIXME: This can happen in some rare cases involving XULish image data + // in combination with our image cache isolation patch. Sure isn't + // a good thing, but it's not really a super-cookie vector either. + // We should fix it eventually. + torbutton_log(4, "Exception on image cache clearing: "+e); } var cache = Components.classes["@mozilla.org/network/cache-service;1"]. @@ -1647,8 +1650,9 @@ function torbutton_disable_browser_js(browser) { } catch(e) { torbutton_log(4, "Failed to disable JS events: "+e) } - - browser.docShell.allowJavascript = false; + + if (browser.docShell) + browser.docShell.allowJavascript = false; try { // My estimation is that this does not get the inner iframe windows,

1 0

[torbutton/master] Try to handle some weird exceptions better.
by mikeperry＠torproject.org 14 Feb '13

14 Feb '13

commit 4e30fa2fbf45d7936078225512baeab30a6dad00 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Feb 10 16:22:51 2013 -0800 Try to handle some weird exceptions better. --- src/chrome/content/torbutton.js | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 946c613..c3320f6 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1694,8 +1694,15 @@ function torbutton_disable_window_js(win) { if (b && b.docShell) { torbutton_disable_browser_js(b); - // kill meta-refresh and existing page loading - b.webNavigation.stop(b.webNavigation.STOP_ALL); + // kill meta-refresh and existing page loading + // XXX: Despite having JUST checked b.docShell, it can + // actually end up NULL here in some cases? + try { + if (b.docShell && b.webNavigation) + b.webNavigation.stop(b.webNavigation.STOP_ALL); + } catch(e) { + torbutton_log(4, "DocShell error: "+e); + } } } } @@ -1722,7 +1729,11 @@ function torbutton_reload_homepage() { Components.interfaces.nsIPrefLocalizedString).data; torbutton_log(3, "Reloading homepage: "+homepage); - gBrowser.loadURI(homepage, null, null); + try { + gBrowser.loadURI(homepage, null, null); + } catch(e) { + torbutton_log(4, "Failure reloading homepage "+homepage+": "+e); + } } // Bug 1506 P0: Toggle, kill it.

1 0

[torbutton/master] Bug 3944: Use ComplexValue for the TBB homepage.
by mikeperry＠torproject.org 14 Feb '13

14 Feb '13

commit cb1f30d3c80e2efa93cfa5b15dcf7a8ebe013f27 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 9 18:19:09 2013 -0800 Bug 3944: Use ComplexValue for the TBB homepage. Required for FF17 anyways. --- src/chrome/content/torbutton.js | 39 ++++++++++++++------------------------- 1 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 82b9150..06e668c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -729,18 +729,27 @@ function torbutton_do_async_versioncheck() { for (var v in version_list) { if (version_list[v] == my_version) { torbutton_log(3, "Version check passed."); - var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); + var homepage = m_tb_prefs.getComplexValue("browser.startup.homepage", + Components.interfaces.nsIPrefLocalizedString).data; if (homepage.indexOf("https://check.torproject.org/") == 0) { - m_tb_prefs.setCharPref("browser.startup.homepage", - "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=1"); + var str = Components.classes["@mozilla.org/supports-string;1"] + .createInstance(Components.interfaces.nsISupportsString); + str.data = "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=1"; + m_tb_prefs.setComplexValue("browser.startup.homepage", + Components.interfaces.nsISupportsString, + str); } return; } } torbutton_log(5, "Your Tor Browser is out of date."); // Not up to date - m_tb_prefs.setCharPref("browser.startup.homepage", - "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=0"); + var str = Components.classes["@mozilla.org/supports-string;1"] + .createInstance(Components.interfaces.nsISupportsString); + str.data = "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=0"; + m_tb_prefs.setComplexValue("browser.startup.homepage", + Components.interfaces.nsISupportsString, + str); return; } catch(e) { torbutton_log(5, "Version check failed! JSON parsing error: "+e); @@ -1702,26 +1711,6 @@ function torbutton_disable_all_js() { } } -// Bug 1506 P0: This has been deprecated in favor of an async check -function torbutton_do_versioncheck() { - if (m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) { - var is_updated = torbutton_check_version(); - var locale = m_tb_prefs.getCharPref("general.useragent.locale"); - if (is_updated == 0) { - // In an ideal world, we'd just check for hasUserValue, but we can't do - // that, because we set browser.startup.homepage to have a user value already... - m_tb_prefs.setCharPref("browser.startup.homepage", - "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=0"); - } else if (is_updated == 1) { - var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); - if (homepage.indexOf("https://check.torproject.org/") == 0) { - m_tb_prefs.setCharPref("browser.startup.homepage", - "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=1"); - } - } - } -} - // Bug 1506 P2: We may want to replace this with a XUl solution. // See #6096. function torbutton_reload_homepage() {

1 0

[torbutton/master] Let's just forget about a updating Torbutton for now.
by mikeperry＠torproject.org 14 Feb '13

14 Feb '13

commit f988be80b5b63f9a8ab3fc36affd17e04c378b05 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Feb 11 18:18:29 2013 -0800 Let's just forget about a updating Torbutton for now. It's pretty much just a part of TBB anyways. --- src/install.rdf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/install.rdf b/src/install.rdf index 37c7348..97aafa5 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -10,7 +10,9 @@ <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL> +    <em:targetApplication>

1 0

[torbutton/master] Update Changelog.
by mikeperry＠torproject.org 14 Feb '13

14 Feb '13

commit be2274e3cce05a4867be67f2b6a418d6f11d2e52 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Feb 11 18:56:47 2013 -0800 Update Changelog. --- src/CHANGELOG | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 940ae73..411baa0 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,7 +1,18 @@ 1.5.0-alpha - ?? Jan 2013 + ?? Feb 2013 * bug 5279: Remove old toggle observers and related code + * bug 3100: Simplify Security Preference UI and associated pref updates + * bug 7470: Eliminate redundancy in our Flash/plugin disabling code + * bug 3944: Leave most preferences under Tor Browser's control + * bug 7974: Disable toggle-on-startup and crash detection logic + * bug 5379: Disable/remove toggle-mode code and related observers + * bug 6431: Add menu hint to Torbutton icon + * bug 6096: Perform version check every time there's a new tab. + * bug 6156: Rate limit version check queries * misc: Allow WebGL and DOM storage. + * misc: Disable independent Torbutton updates + * misc: Disable Drag+Drop support on MacOS X (hopefully temporary) + * misc: Change the recommended SOCKSPort to 9150 (to match TBB) 1.4.6.3 9 Oct 2012

1 0

[torbutton/master] Move proxy preference setting earlier.
by mikeperry＠torproject.org 14 Feb '13

14 Feb '13

commit d7afde7b17d33f18074c57d1baa3be25d417bc58 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Feb 10 18:37:28 2013 -0800 Move proxy preference setting earlier. Defensive-coding measure. We're probably just going to make our SOCKS port fixed instead. --- src/components/startup-observer.js | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index cc5bcd6..e298f78 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -46,6 +46,15 @@ function StartupObserver() { this.logger.log(3, "This is not a Tor Browser's XPCOM"); } + try { + // XXX: We're in a race with HTTPS-Everywhere to update our proxy settings + // before the initial SSL-Observatory test... If we lose the race, Firefox + // caches the old proxy settings for check.tp.o somehwere, and it never loads :( + this.setProxySettings(); + } catch(e) { + this.logger.log(4, "Early proxy change failed. Will try again at profile load. Error: "+e); + } + // Bug 1506 P2/P3: You probably want to register this observer to clean up // prefs if you're going to support using normal firefox. Components.utils.import("resource://gre/modules/AddonManager.jsm");

1 0

[torbutton/master] 9150 is now the recommended proxy port.
by mikeperry＠torproject.org 14 Feb '13

14 Feb '13

commit 8df85f511f9936a108d77c3cba6e3c2b2a5afc8f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Feb 10 23:19:10 2013 -0800 9150 is now the recommended proxy port. --- src/chrome/content/preferences.js | 2 +- src/components/startup-observer.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index fbc82ac..ddc1994 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -72,7 +72,7 @@ function torbutton_prefs_set_field_attributes(doc) if (environ.exists("TOR_SOCKS_PORT")) { doc.getElementById('torbutton_socksPort').value = parseInt(environ.get("TOR_SOCKS_PORT")); } else { - doc.getElementById('torbutton_socksPort').value = 9050; + doc.getElementById('torbutton_socksPort').value = 9150; } if (environ.exists("TOR_SOCKS_HOST")) { diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index e298f78..c3b4251 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -119,7 +119,7 @@ StartupObserver.prototype = { } this.logger.log(3, "Reset socks port to "+environ.get("TOR_SOCKS_PORT")); } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { - this._prefs.setIntPref('extensions.torbutton.socks_port', 9050); + this._prefs.setIntPref('extensions.torbutton.socks_port', 9150); } if (environ.exists("TOR_SOCKS_HOST")) {

1 0

[torbutton/master] Add some commented code to easily disable Drag+Drop on OSX.
by mikeperry＠torproject.org 14 Feb '13

14 Feb '13

commit ad18584261f347688cce5b00b944b5c36d43ac5d Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Feb 11 18:16:28 2013 -0800 Add some commented code to easily disable Drag+Drop on OSX. Just in case the crash bug flares up again. --- src/components/external-app-blocker.js | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index 91f0483..968d051 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -239,6 +239,17 @@ ExternalWrapper.prototype = // from nsIDragService invokeDragSessionWithImage: function(aDOMNode, aTransferableArray, aRegion, aActionType, aImage, aImageX, aImageY, aDragEvent, aDataTransfer) { + /* Drag and drop is perpetually crashy on MacOS. We should to rewrite this whole filter in C++.. + try { + var tbb_ver = this._prefs.getCharPref("torbrowser.version"); + if (tbb_ver.indexOf("MacOS") != -1) { + this.logger.log(3, "Silently blocking MacOS Drag+Drop"); + return 0; + } + } catch(e) { + this.logger.log(3, "Error inspecting TBB version: "+e); + }*/ + for(var i = 0; i < aTransferableArray.Count(); i++) { this.logger.log(3, "Inspecting drag+drop transfer: "+i); var tr = aTransferableArray.GetElementAt(i);

1 0

[torbutton/master] Clean up fingerprinting pref setting a bit.
by mikeperry＠torproject.org 14 Feb '13

14 Feb '13

commit d0caf2b4a32152922daf7425eb87ff9eb067e620 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 13 18:15:30 2013 -0800 Clean up fingerprinting pref setting a bit. Forgot to obey the spoof_english prompt, and we should use TBB defaults. --- src/chrome/content/torbutton.js | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 649cddf..620214f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -154,6 +154,7 @@ var torbutton_unique_pref_observer = torbutton_update_disk_prefs(); break; case "extensions.torbutton.resist_fingerprinting": + case "extensions.torbutton.spoof_english": torbutton_update_fingerprinting_prefs(); break; case "extensions.torbutton.restrict_thirdparty": @@ -1411,22 +1412,35 @@ function torbutton_update_fingerprinting_prefs() { if (m_tb_tbb) { if (mode) { - m_tb_prefs.setIntPref("browser.display.max_font_attempts",10); - m_tb_prefs.setIntPref("browser.display.max_font_count",5); - - m_tb_prefs.setCharPref("intl.accept_languages", "en-us, en"); - m_tb_prefs.setCharPref("intl.accept_charsets", "iso-8859-1,*,utf-8"); - m_tb_prefs.setCharPref("intl.charsetmenu.browser.cache", "UTF-8"); + // Use TBB pref defaults for these two. + if(m_tb_prefs.prefHasUserValue("browser.display.max_font_attempts")) + m_tb_prefs.clearUserPref("browser.display.max_font_attempts"); + if(m_tb_prefs.prefHasUserValue("browser.display.max_font_count")) + m_tb_prefs.clearUserPref("browser.display.max_font_count"); + + // Governed also by the spoof_english dialog.. + if (m_tb_prefs.getBoolPref("extensions.torbutton.spoof_english")) { + m_tb_prefs.setCharPref("intl.accept_languages", "en-us, en"); + m_tb_prefs.setCharPref("intl.accept_charsets", "iso-8859-1,*,utf-8"); + m_tb_prefs.setCharPref("intl.charsetmenu.browser.cache", "UTF-8"); + } else { + if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) + m_tb_prefs.clearUserPref("intl.accept_languages"); + if(m_tb_prefs.prefHasUserValue("intl.charsetmenu.browser.cache")) + m_tb_prefs.clearUserPref("intl.charsetmenu.browser.cache"); + if(m_tb_prefs.prefHasUserValue("intl.accept_charsets")) + m_tb_prefs.clearUserPref("intl.accept_charsets"); + } } else { m_tb_prefs.setIntPref("browser.display.max_font_attempts",-1); m_tb_prefs.setIntPref("browser.display.max_font_count",-1); if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) - m_tb_prefs.clearUserPref("intl.accept_languages"); + m_tb_prefs.clearUserPref("intl.accept_languages"); if(m_tb_prefs.prefHasUserValue("intl.charsetmenu.browser.cache")) - m_tb_prefs.clearUserPref("intl.charsetmenu.browser.cache"); + m_tb_prefs.clearUserPref("intl.charsetmenu.browser.cache"); if(m_tb_prefs.prefHasUserValue("intl.accept_charsets")) - m_tb_prefs.clearUserPref("intl.accept_charsets"); + m_tb_prefs.clearUserPref("intl.accept_charsets"); } }

1 0

[torbutton/master] Browser-based update notification.
by mikeperry＠torproject.org 14 Feb '13

14 Feb '13

commit 5e573e043a135d89a426f1d296d2df6944c600d0 Author: Kathleen Brade <brade(a)pearlcrescent.com> Date: Wed Feb 13 18:04:47 2013 -0800 Browser-based update notification. --- src/chrome/content/popup.xul | 9 +++++ src/chrome/content/torbutton.js | 54 ++++++++++++++++++++++++++++++- src/chrome/locale/en/torbutton.dtd | 2 + src/chrome/skin/tor-update-16.gif | Bin 0 -> 1304 bytes src/chrome/skin/tor-update-24.gif | Bin 0 -> 1732 bytes src/chrome/skin/torbutton.css | 9 +++++ src/defaults/preferences/preferences.js | 1 + 7 files changed, 74 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index dd7a398..6dc8451 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -36,6 +36,15 @@ accesskey="&torbutton.context_menu.about.key;" insertafter="context-stop" oncommand="window.open('chrome://torbutton/content/about.xul', '', 'chrome,centerscreen');"/> + + <menuseparator hidden="true"/> + <menuitem id="torbutton-downloadUpdate" + label="&torbutton.context_menu.downloadUpdate;" + accesskey="&torbutton.context_menu.downloadUpdate.key;" + insertafter="context-stop" + oncommand="torbutton_download_update()" + hidden="true"/> + </menupopup> </overlay> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index c3320f6..649cddf 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -7,6 +7,8 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work +const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; + // status var m_tb_wasinited = false; var m_tb_prefs = false; @@ -69,6 +71,9 @@ var torbutton_window_pref_observer = torbutton_update_toolbutton(mode); torbutton_update_statusbar(mode); break; + case k_tb_browser_update_needed_pref: + torbutton_notify_if_update_needed(); + break; } } } @@ -441,6 +446,7 @@ function torbutton_init() { var mode = m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"); torbutton_update_toolbutton(mode); torbutton_update_statusbar(mode); + torbutton_notify_if_update_needed(); torbutton_log(3, 'init completed'); } @@ -593,6 +599,50 @@ function torbutton_get_statuspanel() { return o_statuspanel; } +function torbutton_notify_if_update_needed() { + function setOrClearAttribute(aElement, aAttrName, aValue) + { + if (!aElement || !aAttrName) + return; + + if (aValue) + aElement.setAttribute(aAttrName, aValue); + else + aElement.removeAttribute(aAttrName); + } + + var updateNeeded = false; + try { + updateNeeded = m_tb_prefs.getBoolPref(k_tb_browser_update_needed_pref); + } catch (e) {} + + // Change look of toolbar item (enable/disable animated update icon). + var btn = torbutton_get_toolbutton(); + setOrClearAttribute(btn, "tbUpdateNeeded", updateNeeded); + + // Hide/show download menu item and preceding separator. + var item = document.getElementById("torbutton-downloadUpdate"); + setOrClearAttribute(item, "hidden", !updateNeeded); + if (item) + setOrClearAttribute(item.previousSibling, "hidden", !updateNeeded); +} + +function torbutton_download_update() { + var downloadURI = "https://www.torproject.org/download/download-easy.html"; + var rtSvc = Components.classes["@mozilla.org/xre/app-info;1"] + .getService(Components.interfaces.nsIXULRuntime); + downloadURI += "?os=" + rtSvc.OS + "&arch=" + rtSvc.XPCOMABI; + if (rtSvc.OS == "Darwin") + downloadURI += "#mac"; + else if (rtSvc.OS == "WINNT") + downloadURI += "#win"; + else if (rtSvc.OS == "Linux") + downloadURI += "#linux"; + + var newTab = gBrowser.addTab(downloadURI); + gBrowser.selectedTab = newTab; +} + // Bug 1506 P0: Toggle. Kill kill kill. function torbutton_save_nontor_settings() { @@ -690,7 +740,7 @@ function torbutton_do_async_versioncheck() { } // Suppress update check if done recently. - const kLastCheckPref = "extension.torbutton.lastUpdateCheck"; + const kLastCheckPref = "extensions.torbutton.lastUpdateCheck"; const kMinSecsBetweenChecks = 90 * 60; // 1.5 hours var now = Date.now() / 1000; var lastCheckTime; @@ -729,6 +779,7 @@ function torbutton_do_async_versioncheck() { for (var v in version_list) { if (version_list[v] == my_version) { torbutton_log(3, "Version check passed."); + m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); var homepage = m_tb_prefs.getComplexValue("browser.startup.homepage", Components.interfaces.nsIPrefLocalizedString).data; if (homepage.indexOf("https://check.torproject.org/") == 0) { @@ -743,6 +794,7 @@ function torbutton_do_async_versioncheck() { } } torbutton_log(5, "Your Tor Browser is out of date."); + m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, true); // Not up to date var str = Components.classes["@mozilla.org/supports-string;1"] .createInstance(Components.interfaces.nsISupportsString); diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index cfd014c..cbda0a2 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -35,6 +35,8 @@ <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "About Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> +<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> +<!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Copy Tor URL"> diff --git a/src/chrome/skin/tor-update-16.gif b/src/chrome/skin/tor-update-16.gif new file mode 100644 index 0000000..d006458 Binary files /dev/null and b/src/chrome/skin/tor-update-16.gif differ diff --git a/src/chrome/skin/tor-update-24.gif b/src/chrome/skin/tor-update-24.gif new file mode 100644 index 0000000..72591a8 Binary files /dev/null and b/src/chrome/skin/tor-update-24.gif differ diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index 676122e..2218e9f 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -7,6 +7,9 @@ #torbutton-button[tbstatus="off"] { list-style-image: url("chrome://torbutton/skin/tor-disabled-24.png"); } +#torbutton-button[tbUpdateNeeded="true"] { + list-style-image: url("chrome://torbutton/skin/tor-update-24.gif"); +} toolbar[iconsize="small"] #torbutton-button { list-style-image: url("chrome://torbutton/skin/tor-16.png"); } @@ -16,6 +19,9 @@ toolbar[iconsize="small"] #torbutton-button[tbstatus="on"] { toolbar[iconsize="small"] #torbutton-button[tbstatus="off"] { list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png"); } +toolbar[iconsize="small"] #torbutton-button[tbUpdateNeeded="true"] { + list-style-image: url("chrome://torbutton/skin/tor-update-16.gif"); +} #torbutton-panel { list-style-image: url("chrome://torbutton/skin/tor-16.png"); @@ -86,3 +92,6 @@ statusbarpanel#plugins-status[status="0"] { list-style-image: url("chrome://torbutton/skin/poff.png"); } +#torbutton-downloadUpdate { + font-weight: bold; +} diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 26cd2f3..4f81acc 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -7,6 +7,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_panel",true); pref("extensions.torbutton.panel_style",'text'); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); +pref("extensions.torbutton.updateNeeded", false); // proxy prefs pref("extensions.torbutton.settings_method",'recommended');

1 0