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

[tor/master] test_config.c: log which address should have failed
by nickm＠torproject.org 03 Feb '14

03 Feb '14

commit c61a472076bb287f94c843f1bddf5e1604014dfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 3 16:21:32 2014 -0500 test_config.c: log which address should have failed --- src/test/test_config.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 6a285db..3a1b6d7 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -358,6 +358,8 @@ static void bad_bridge_line_test(const char *string) { bridge_line_t *bridge_line = parse_bridge_line(string); + if (bridge_line) + TT_FAIL(("%s was supposed to fail, but it didn't.", string)); test_assert(!bridge_line); done:

1 0

[tor/master] Clean up test_hs.c: warning fix; tor_free() usage.
by nickm＠torproject.org 03 Feb '14

03 Feb '14

commit 24544a10c0f9e9022d13a413bf3330745d851afa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 3 16:12:30 2014 -0500 Clean up test_hs.c: warning fix; tor_free() usage. My OSX laptop rightly gave a warning because of sticking strlen() into an int, but once I took a closer look... it appears that the strlen() was part of a needlessly verbose implementation for tor_strdup(). While I was there, I fixed the usage of tor_free() in test_hs.c: It checks for NULL, and it zeros its argument. So instead of if (foo) { tor_free(foo); foo = NULL; } we should just say tor_free(foo); --- src/test/test_hs.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index a9e6644..75c9b62 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -25,13 +25,10 @@ static void send_control_event_string_replacement(uint16_t event, event_format_t which, const char *msg) { - int msg_len; - (void) event; (void) which; - msg_len = strlen(msg); - received_msg = tor_malloc_zero(msg_len+1); - strncpy(received_msg, msg, msg_len); + tor_free(received_msg); + received_msg = tor_strdup(msg); } /** Make sure each hidden service descriptor async event generation @@ -67,7 +64,6 @@ test_hs_desc_event(void *arg) test_assert(received_msg); test_streq(received_msg, expected_msg); tor_free(received_msg); - received_msg = NULL; /* test received event */ rend_query.auth_type = 1; @@ -77,7 +73,6 @@ test_hs_desc_event(void *arg) test_assert(received_msg); test_streq(received_msg, expected_msg); tor_free(received_msg); - received_msg = NULL; /* test failed event */ rend_query.auth_type = 2; @@ -87,7 +82,6 @@ test_hs_desc_event(void *arg) test_assert(received_msg); test_streq(received_msg, expected_msg); tor_free(received_msg); - received_msg = NULL; /* test invalid auth type */ rend_query.auth_type = 999; @@ -97,14 +91,10 @@ test_hs_desc_event(void *arg) test_assert(received_msg); test_streq(received_msg, expected_msg); tor_free(received_msg); - received_msg = NULL; done: UNMOCK(send_control_event_string); - if (received_msg) { - tor_free(received_msg); - received_msg = NULL; - } + tor_free(received_msg); } struct testcase_t hs_tests[] = {

1 0

[torbutton/master] Bug #10800: Prevent exception in New Identity
by mikeperry＠torproject.org 03 Feb '14

03 Feb '14

commit 32621b90f7322aaee5806e5600a23380241044d8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 3 12:16:39 2014 -0800 Bug #10800: Prevent exception in New Identity Exceptions can apparently happen in rare, unknown cases while clearing search/find boxes. --- src/chrome/content/torbutton.js | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3b51c86..1f8e82c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1486,14 +1486,24 @@ function torbutton_do_new_identity() { torbutton_close_on_toggle(true, true); - var searchBar = window.document.getElementById("searchbar"); - if (searchBar) - searchBar.textbox.reset(); - - if (gFindBarInitialized) { - var findbox = gFindBar.getElement("findbar-textbox"); - findbox.reset(); - gFindBar.close(); + // Bug #10800: Trying to clear search/find can cause exceptions + // in unknown cases. Just log for now. + try { + var searchBar = window.document.getElementById("searchbar"); + if (searchBar) + searchBar.textbox.reset(); + } catch(e) { + torbutton_log(5, "New Identity: Exception on clearing search box: "+e); + } + + try { + if (gFindBarInitialized) { + var findbox = gFindBar.getElement("findbar-textbox"); + findbox.reset(); + gFindBar.close(); + } + } catch(e) { + torbutton_log(5, "New Identity: Exception on clearing find bar: "+e); } torbutton_log(3, "New Identity: Emitting Private Browsing Session clear event");

1 0

[torbutton/master] Bump version and add changelog entries for 1.6.6.0.
by mikeperry＠torproject.org 03 Feb '14

03 Feb '14

commit 7633f5a1007b71ad703d48ed8887ad0d94730b04 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 3 13:10:26 2014 -0800 Bump version and add changelog entries for 1.6.6.0. --- src/CHANGELOG | 12 ++++++++++++ src/install.rdf | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index ada9bf9..acbc736 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,15 @@ +1.6.6.0: + 3 Feb 2014 + * Bug #10800: Prevent exception in New Identity + * Bug #10640: Fix about:tor's pointer position for RTL languages. + * Bug 10095: Make inner window a multiple of 200x100 + * Bug 10285: Clear permissions on New Identity + * Bug 9738: Fix for auto-maximizing on browser start + * Bug #10682: Workaround to really disable updates for Torbutton. + * Bug #10419: Don't allow connections to localhost + * Bug #10140: Move Japanese to extra locales + * Bug #10687: Add Basque (eu) to extra locales + 1.6.5.5: 20 Jan 2014 * Bug 9486: Properly clear NoScript Temporary Permissions diff --git a/src/install.rdf b/src/install.rdf index 2a37879..e183f91 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.5.5</em:version> + <em:version>1.6.6.0</em:version> <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>

1 0

[torbutton/master] Update translations from transifex.
by mikeperry＠torproject.org 03 Feb '14

03 Feb '14

commit 184bf36106e64705ebbcaf08cba092b862da1f2e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 3 13:09:56 2014 -0800 Update translations from transifex. --- src/chrome/locale/fa/aboutTor.dtd | 16 ++++++++-------- src/chrome/locale/fa/brand.dtd | 2 +- src/chrome/locale/ja/aboutTor.dtd | 38 ++++++++++++++++++------------------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index 08bf75c..b8f8058 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -6,9 +6,9 @@ <!ENTITY aboutTor.title "درباره‌ی تور"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> +<!ENTITY aboutTor.outOfDateTorOn.label "با این حال ٫ این مرورگر قدیمی می باشد."> +<!ENTITY aboutTor.outOfDateTorOff.label "همچنین ٫ این مرورگر قدیمی می باشد ."> +<!ENTITY aboutTor.outOfDate2.label "بر روی پیاز(نماد تور) کلیک نمایید و بسته مرورگر تور را جهت بروزرسانی دریافت نمایید."> <!ENTITY aboutTor.check.label "تنظیمات شبکه‌ی تور را بررسی کنید"> @@ -42,8 +42,8 @@ <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> <!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with "> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "با"> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "با"> <!ENTITY aboutTor.searchSP.search.label "Startpage"> <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> @@ -54,13 +54,13 @@ <!ENTITY aboutTor.torInfo1.label "اطلاعات بيشتر"> <!ENTITY aboutTor.torInfo2.label "كشور و آدرس آى پی:"> <!ENTITY aboutTor.torInfo3.label "مسيرياب مخرج"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> +<!ENTITY aboutTor.torInfo4.label "این سرور هیچ گزارشی از فعالیت بازدید کنندگان خود ثبت نمی کند."> +<!ENTITY aboutTor.whatnextQuestion.label "بعدی چیست؟"> <!ENTITY aboutTor.whatnextAnswer.label "تور همه‌ی نیاز شما برای ناشناس ماندن در وب را برآورده نمی‌کند! برای اطمینان از ایمنی هویتتان، نیاز دارید برخی عادات وبگردیتان را تغییر دهید."> <!ENTITY aboutTor.whatnext.label "راهنمایی برای ناشناس ماندن."> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "می‌توانید کمک کنید!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> +<!ENTITY aboutTor.helpInfo2.label "راه های زیادی برای کمک کردن شما جهت سریعتر کردن و مستحکم کردن شبکه تور وجود دارد:"> <!ENTITY aboutTor.helpInfo3.label "مسيرياب تورى اداره كنيد »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "داوطلب شويد »"> diff --git a/src/chrome/locale/fa/brand.dtd b/src/chrome/locale/fa/brand.dtd index f6b21e0..b11f2dc 100644 --- a/src/chrome/locale/fa/brand.dtd +++ b/src/chrome/locale/fa/brand.dtd @@ -5,4 +5,4 @@ <!ENTITY brandShortName "مرورگر تور"> <!ENTITY brandFullName "مرورگر تور"> <!ENTITY vendorShortName "پروژهٔ تور"> -<!ENTITY trademarkInfo.part1 ""> +<!ENTITY trademarkInfo.part1 "فایرفاکس و لوگو فایرفاکس نشان تجاری بنیاد موزیلا می باشند."> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index 1f96caf..c211960 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -13,13 +13,13 @@ <!ENTITY aboutTor.check.label "Torのネットワーク設定をテストする"> <!ENTITY aboutTor.success.label "おめでとうございます!"> -<!ENTITY aboutTor.success2.label "このブラウザはTorを使用するように設定されています。"> -<!ENTITY aboutTor.success3.label "現在自由に匿名でインターネットをブラウズ出来ます。"> -<!ENTITY aboutTor.failure.label "何かがおかしいです!"> -<!ENTITY aboutTor.failure2.label "Torはこのブラウザでは動作しません。"> +<!ENTITY aboutTor.success2.label "このブラウザは、Torを使用するように設定されています。"> +<!ENTITY aboutTor.success3.label "現在、自由に匿名でインターネットをブラウズ出来ます。"> +<!ENTITY aboutTor.failure.label "何かが間違っています！"> +<!ENTITY aboutTor.failure2.label "Torは、このブラウザでは動作しません。"> <!ENTITY aboutTor.failure3prefix.label "サポートについては、お問い合わせください。"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> +<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org まで"> +<!ENTITY aboutTor.failure3suffix.label "。"> <!ENTITY aboutTor.search.label "検索"> @@ -34,16 +34,16 @@ --> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "検索"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "検索"> +<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "検索しましょう"> +<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "検索しましょう"> <!ENTITY aboutTor.searchSP.privacy.label "安全に"> <!ENTITY aboutTor.searchDDG.privacy.label "安全に"> <!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> <!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "一緒に"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "一緒に"> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "with "> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with "> <!ENTITY aboutTor.searchSP.search.label "スタートページ"> <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> @@ -54,20 +54,20 @@ <!ENTITY aboutTor.torInfo1.label "追加情報: "> <!ENTITY aboutTor.torInfo2.label "国とIPアドレス:"> <!ENTITY aboutTor.torInfo3.label "出口ノード:"> -<!ENTITY aboutTor.torInfo4.label "このサーバは、ビジターのあらゆる情報を記録しません。"> +<!ENTITY aboutTor.torInfo4.label "このサーバーは、訪問者のいかなる情報も記録しません。"> <!ENTITY aboutTor.whatnextQuestion.label "次はなんですか？"> -<!ENTITY aboutTor.whatnextAnswer.label "Torだけが匿名にブラウズするのに必要というわけではありません! あなたの身元を安全に保つには、ブラウジングの習慣の一部を変える必要があるかもしれません。"> -<!ENTITY aboutTor.whatnext.label "匿名性を保つことについてのヒント"> +<!ENTITY aboutTor.whatnextAnswer.label "Torだけが匿名にブラウズするのに必要というわけではないのです！あなたの身元を安全に保つには、ブラウジングの習慣の一部を変える必要があるかもしれません。"> +<!ENTITY aboutTor.whatnext.label "匿名性を保つことについてのヒント »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "あなたは助けられます!"> -<!ENTITY aboutTor.helpInfo2.label "Torネットワークをより高速でより強力にすることをたすけられる多くのやり方があります。"> +<!ENTITY aboutTor.helpInfo1.label "助けてください！"> +<!ENTITY aboutTor.helpInfo2.label "Torネットワークをさらに高速に、さらに強力にするのに役立てるたくさんのやり方があります。"> <!ENTITY aboutTor.helpInfo3.label "Torリレーノードを起動 »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "ボランティアを志願する"> +<!ENTITY aboutTor.helpInfo4.label "ボランティアに志願する >>"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "寄付をする"> +<!ENTITY aboutTor.helpInfo5.label "寄付する »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "Tor Projectはオンラインの匿名性とプライバシーの研究と開発、教育を専門に行うアメリカ合衆国の501(c)(3)に基づく非営利団体です。"> -<!ENTITY aboutTor.learnMore.label "Tor Projectに関する詳細は »"> +<!ENTITY aboutTor.footer.label "Tor Projectは、オンラインの匿名性とプライバシーの研究・開発・教育を専門に行う米国の501(c)(3)非営利団体です。"> +<!ENTITY aboutTor.learnMore.label "Tor Projectに関する詳細 »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">

1 0

[torbutton/master] Bug 9738: Fix for auto-maximizing on browser start
by mikeperry＠torproject.org 03 Feb '14

03 Feb '14

commit b1d6dbb22fb35bf6954f84dd9f7fc1d5002ffa63 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 17 10:03:24 2014 +0000 Bug 9738: Fix for auto-maximizing on browser start On some OS/desktop combinations there is a auto-maximize feature that breaks our efforts to resize the inner window to a multiple of 200x100 on start-up. We fix that by listening to the sizemodechange event and resizing the window again in case it got indeed maximized. --- src/chrome/content/torbutton.js | 40 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9ee5d0f..b18dcda 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2768,6 +2768,46 @@ var torbutton_resizelistener = height = Math.floor(maxHeight/100.0)*100; + var handler = function() { + if (window.windowState === 1) { + window.addEventListener("resize", + function() { + win.resizeBy(width - win.innerWidth, height - win.innerHeight); + var calling_function = arguments.callee; + setTimeout(function() { + torbutton_log(3, "Removing resize listener.."); + window.removeEventListener("resize", + calling_function, false); + }, 1000); + }, false); + } + }; + + // We need to handle OSes that auto-maximize windows depending on user + // settings and/or screen resolution. We add a listener which is + // triggerred as soon as the window gets maximized (windowState = 1). + // Alas, the Firefox window code is handling the event not itself: + // "// Note the current implementation of SetSizeMode just stores + // // the new state; it doesn't actually resize. So here we store + // // the state and pass the event on to the OS." + // (See: https://mxr.mozilla.org/mozilla-esr24/source/xpfe/appshell/src/ + // nsWebShellWindow.cpp#353) + // This means we have to cope with race conditions and resizing in the + // sizemodechange listener is likely to fail. Thus, we add a specific + // resize listener that is doing the work for us. It seems (at least on + // Ubuntu) to be the case that maximizing (and then again normalizing) of + // the window triggers more than one resize event the first being not the + // one we need. Thus we can't remove the listener after the first resize + // event got fired. Thus, we have the rather klunky setTimeout() call. + window.addEventListener("sizemodechange", handler, false); + + // We like to remove the sizemodechange listener for everybody again in + // order to allow resizing the window after the start-up + setTimeout(function() { + torbutton_log(3, "Removing sizemodechange listener.."); + window.removeEventListener("sizemodechange", handler, false); + }, 1000); + // This is fun. any attempt to directly set the inner window actually // resizes the outer width to that value instead. Must use resizeBy() // instead of assignment or resizeTo()

1 0

[torbutton/master] Bug 10285: Clear permissions on New Identity
by mikeperry＠torproject.org 03 Feb '14

03 Feb '14

commit 2418d8693fc6bd4b4a18aeb14cf39fd9cb660cf8 Author: Georg Koppen <g.koppen(a)jondos.de> Date: Mon Dec 9 14:48:38 2013 +0100 Bug 10285: Clear permissions on New Identity We should clear permissions on New Identity as e.g. the web notification permission would be able to link the old and the new session otherwise. --- src/chrome/content/torbutton.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index b18dcda..07f5e19 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1405,6 +1405,7 @@ function torbutton_new_identity() { * g. SSL Session IDs * h. last open location url * i. clear content prefs + * j. permissions * 3. Sends tor the NEWNYM signal to get a new circuit * 4. Opens a new window with the default homepage * 5. Closes this window @@ -1579,14 +1580,20 @@ function torbutton_do_new_identity() { createInstance(Ci.nsIContentPrefService); cps.removeGroupedPrefs(); } - + torbutton_log(3, "New Identity: Syncing prefs"); // Force prefs to be synced to disk var prefService = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefService); prefService.savePrefFile(null); - + + torbutton_log(3, "New Identity: Clearing permissions"); + + let pm = Cc["@mozilla.org/permissionmanager;1"]. + getService(Ci.nsIPermissionManager); + pm.removeAll(); + torbutton_log(3, "New Identity: Sending NEWNYM"); // We only support TBB for newnym.

1 0

[torbutton/master] Bug 10095: Make inner window a multiple of 200x100
by mikeperry＠torproject.org 03 Feb '14

03 Feb '14

commit d5822f67f694fd3cc23f1564da825250ca61217f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 10 15:01:59 2014 +0100 Bug 10095: Make inner window a multiple of 200x100 In order to be sure that no other extension is resizing the inner window due to merging its overlay into the chrome we resize the window (again) via a mutation observer and a setTimeout(0) call. The mutation observer helps us as DevTools code is modifying the DOM during start-up. This approach minimizes the possible usability issues as well as the window just gets larger by some pixels while being visible (if it gets larger at all, i.e. if proper resizing did not succeed before the window got visible). Provided it gets visible in the first place before the final resizing gets applied. --- src/chrome/content/torbutton.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 07f5e19..c9e03e9 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2823,6 +2823,39 @@ var torbutton_resizelistener = win.innerHeight + " to " + width + "x" + height + " in state " + window.windowState); + // Resizing within this progress listener does not always work as overlays + // of other extensions might still influence the height/width of the + // chrome and therefore the height/width of the content window. Doing a + // fallback resize with setTimeout(0) from this progess listener does not + // work on some machines (probably due to race conditions which are all + // over the place). Thus we need a point later in the start-up process + // where we can do this... Please welcome the mutation observer. + let mut_target = document.getElementById("main-window"); + let mut_observer = new MutationObserver( + function(mutations) { + mutations.forEach( + function(mutation) { + torbutton_log(3, "Mutation observer: Window dimensions are: " + + win.innerWidth + " x " + win.innerHeight); + setTimeout(function() { + win.resizeBy(width - win.innerWidth, + height - win.innerHeight); + torbutton_log(3, "Mutation observer: Window " + + "dimensions are (after resizing again): " + win. + innerWidth + " x " + win.innerHeight); + }, 0); + mut_observer.disconnect(); + } + ); + } + ); + // Configuration of the observer. Looking at added nodes is enough as + // DevTools related code is manipulating the DOM which we can capture. + // From that on we can start our fallback resizing. + let mut_config = { attributes: false, childList: true, + characterData: false }; + mut_observer.observe(mut_target, mut_config); + progress.removeProgressListener(this); } },

1 0

[torbutton/master] Bug #10640: Fix about:tor's pointer position for RTL languages.
by mikeperry＠torproject.org 03 Feb '14

03 Feb '14

commit 1ba3e0449378bd0def3f1597cdad50d0e551feb6 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jan 22 11:03:16 2014 -0500 Bug #10640: Fix about:tor's pointer position for RTL languages. We now position the arrow so it points to the toolbar button regardless of its position. --- src/chrome/content/aboutTor/aboutTor.xhtml | 80 +++++++++++++++++--- .../content/aboutTor/onionArrow-extension.png | Bin 0 -> 1695 bytes src/chrome/content/aboutTor/onionArrow-right.png | Bin 0 -> 2503 bytes src/chrome/content/aboutTor/onionArrow-short.png | Bin 0 -> 1913 bytes src/chrome/content/aboutTor/onionArrowRight.png | Bin 1695 -> 0 bytes src/chrome/content/torbutton.js | 45 ++++++++++- src/chrome/skin/aboutTor.css | 21 +++-- 7 files changed, 126 insertions(+), 20 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index ce06941..6efe617 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -25,24 +25,82 @@ <![CDATA[ function onLoad() { - window.addEventListener("resize", function() { - resizeToolbarIconArrow(); + document.addEventListener("AboutTorAdjustArrow", function() { + adjustToolbarIconArrow(); }, false); window.setTimeout( function() { - resizeToolbarIconArrow(); + adjustToolbarIconArrow(); document.getElementById('sx').focus(); }, 0); } -function resizeToolbarIconArrow() +function adjustToolbarIconArrow() { var textElem = document.getElementById("updatePrompt"); - var rightDiv = document.getElementById("toolbarIconArrowRight"); - if (textElem && rightDiv) + var arrowDiv = document.getElementById("toolbarIconArrow"); + var extDiv = document.getElementById("toolbarIconArrowExtension"); + if (textElem && arrowDiv && extDiv) { - var width = textElem.offsetLeft - rightDiv.offsetLeft - 6; - rightDiv.style.width = width + "px"; + var tbXpos; + if (document.body.hasAttribute("torbutton-xpos")) + tbXpos = parseInt(document.body.getAttribute("torbutton-xpos"), 10); + + if (!tbXpos || isNaN(tbXpos) || (tbXpos < 0)) + { + arrowDiv.style.display = "none"; + extDiv.style.display = "none"; + return; + } + + // Account for content zoom and retina displays by converting to device + // independent units. + if ("devicePixelRatio" in window) // FF18+ + tbXpos /= window.devicePixelRatio; + + const kArrowMargin = 6; + arrowDiv.style.display = "block"; // Must be visible to get offsetWidth. + var arrowHalfWidth = arrowDiv.offsetWidth / 2.0; + var leftAnchor = textElem.offsetLeft - kArrowMargin - arrowHalfWidth; + var rightAnchor = textElem.offsetLeft + textElem.offsetWidth + + kArrowMargin + arrowHalfWidth; + + var arrowDisplay = "block"; + var extDisplay = "block"; + if (tbXpos < leftAnchor) + { + // Toolbar button to left of text. + arrowDiv.setAttribute("pos", "left"); + arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; + var extLeft = tbXpos + arrowHalfWidth; + extDiv.style.left = extLeft + "px"; + extDiv.style.width = (textElem.offsetLeft - extLeft - kArrowMargin) + "px"; + } + else if ((tbXpos > rightAnchor) && + (tbXpos < (window.innerWidth - arrowHalfWidth))) + { + // Toolbar button to right of text. + arrowDiv.setAttribute("pos", "right"); + arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; + var extLeft = rightAnchor - arrowHalfWidth; + extDiv.style.left = extLeft + "px"; + extDiv.style.width = (tbXpos - arrowHalfWidth - extLeft) + "px"; + } + else if ((tbXpos >= leftAnchor) && (tbXpos <= rightAnchor)) + { + // Toolbar button in middle about text; use arrow without a tail. + arrowDiv.setAttribute("pos", "middle"); + arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; + extDisplay = "none"; + } + else // Unable to display arrow (e.g., toolbar button is above sidebar). + { + arrowDisplay = "none"; + extDisplay = "none"; + } + + arrowDiv.style.display = arrowDisplay; + extDiv.style.display = extDisplay; } } ]]> @@ -70,8 +128,8 @@ function resizeToolbarIconArrow() <h1 class="hideIfTorOff">&aboutTor.outOfDateTorOn.label;</h1> <h1 class="hideIfTorOn">&aboutTor.outOfDateTorOff.label;</h1> <h3 id="updatePrompt">&aboutTor.outOfDate2.label;</h3> - <div id="toolbarIconArrowLeft"/> - <div id="toolbarIconArrowRight"/> + <div id="toolbarIconArrow"/> + <div id="toolbarIconArrowExtension"/> </div> </div> diff --git a/src/chrome/content/aboutTor/onionArrow-extension.png b/src/chrome/content/aboutTor/onionArrow-extension.png new file mode 100644 index 0000000..7552f2d Binary files /dev/null and b/src/chrome/content/aboutTor/onionArrow-extension.png differ diff --git a/src/chrome/content/aboutTor/onionArrow-right.png b/src/chrome/content/aboutTor/onionArrow-right.png new file mode 100644 index 0000000..b9f6d1e Binary files /dev/null and b/src/chrome/content/aboutTor/onionArrow-right.png differ diff --git a/src/chrome/content/aboutTor/onionArrow-short.png b/src/chrome/content/aboutTor/onionArrow-short.png new file mode 100644 index 0000000..23e5a20 Binary files /dev/null and b/src/chrome/content/aboutTor/onionArrow-short.png differ diff --git a/src/chrome/content/aboutTor/onionArrowRight.png b/src/chrome/content/aboutTor/onionArrowRight.png deleted file mode 100644 index 7552f2d..0000000 Binary files a/src/chrome/content/aboutTor/onionArrowRight.png and /dev/null differ diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index c9e03e9..3b51c86 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -512,6 +512,11 @@ function torbutton_init() { torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register(); + + // Detect toolbar customization and update arrow on about:tor pages. + window.addEventListener("aftercustomization", function() { + torbutton_update_all_abouttor_pages(undefined, undefined); + }, false); //setting up context menu //var contextMenu = document.getElementById("contentAreaContextMenu"); @@ -848,8 +853,8 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { else aDoc.body.removeAttribute("torNeedsUpdate"); - try - { + // Display product name and TBB version. + try { const kBrandBundle = "chrome://branding/locale/brand.properties"; let brandBundle = Cc["@mozilla.org/intl/stringbundle;1"] .getService(Ci.nsIStringBundleService) @@ -862,11 +867,43 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { e.removeChild(e.firstChild); e.appendChild(aDoc.createTextNode(productName + '\n' + tbbVersion)); } catch (e) {} + + torbutton_update_abouttor_arrow(aDoc); } return isAboutTor; } +// Determine X position of torbutton toolbar item and pass it through +// to the xhtml document. +function torbutton_update_abouttor_arrow(aDoc) { + try { + let tbXpos = -1; + let tbItem = torbutton_get_toolbutton(); + if (tbItem) { + let tbItemRect = tbItem.getBoundingClientRect(); + let contentElem = document.getElementById("content"); + let contentRect = contentElem.getBoundingClientRect(); + if (tbItemRect.top < contentRect.top) { + tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - + contentElem.getBoundingClientRect().left; + } + } + if (tbXpos >= 0) { + if ("devicePixelRatio" in window) // FF18+ + tbXpos *= window.devicePixelRatio; // Convert to device pixels. + + tbXpos = Math.round(tbXpos); + aDoc.body.setAttribute("torbutton-xpos", tbXpos); + } else { + aDoc.body.removeAttribute("torbutton-xpos"); + } + + let evt = new Event("AboutTorAdjustArrow"); + aDoc.dispatchEvent(evt); + } catch(e) {} +} + function torbutton_override_BrowserOnAboutPageLoad(aDoc) { if (torbutton_is_abouttor_doc(aDoc) && !aDoc.documentElement.hasAttribute("aboutTorLoaded")) { @@ -877,6 +914,10 @@ function torbutton_override_BrowserOnAboutPageLoad(aDoc) { let needsUpdate = torbutton_update_is_needed(); torbutton_update_abouttor_doc(aDoc, torOn, needsUpdate); + aDoc.defaultView.addEventListener("resize", + function() { torbutton_update_abouttor_arrow(aDoc); }, + false); + // Insert "Test Tor Network Settings" url. let elem = aDoc.getElementById("testTorSettings"); if (elem) { diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 12f8a09..192e345 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, The Tor Project, Inc. + * Copyright (c) 2014, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -58,22 +58,29 @@ body[toron] #torstatus-image { background-image: url('chrome://torbutton/content/aboutTor/tor-off.png'); } -#toolbarIconArrowLeft, #toolbarIconArrowRight { +#toolbarIconArrow, #toolbarIconArrowExtension { position: absolute; top: 4px; height: 250px; } -#toolbarIconArrowLeft { - left: 78px; +#toolbarIconArrow { width: 30px; background-image: url('chrome://torbutton/content/aboutTor/onionArrow.png'); } -#toolbarIconArrowRight { - left: 108px; +#toolbarIconArrow[pos="middle"] { + background-image: url('chrome://torbutton/content/aboutTor/onionArrow-short.png'); + height: 36px; +} + +#toolbarIconArrow[pos="right"] { + background-image: url('chrome://torbutton/content/aboutTor/onionArrow-right.png'); +} + +#toolbarIconArrowExtension { width: 10px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrowRight.png'); + background-image: url('chrome://torbutton/content/aboutTor/onionArrow-extension.png'); } a {

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 03 Feb '14

03 Feb '14

commit c237ca218ad539af43e2af36e3722a0612ea6e73 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 3 20:15:37 2014 +0000 Update translations for mat-gui_completed --- lv.po | 104 ++++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 65 insertions(+), 39 deletions(-) diff --git a/lv.po b/lv.po index 26a3f21..8216503 100644 --- a/lv.po +++ b/lv.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ojars Balcers <ojars.balcers(a)gmail.com>, 2013 +# Translators: +# Ojars Balcers <ojars.balcers(a)gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-07-27 13:20+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-01-19 14:48+0000\n" +"PO-Revision-Date: 2014-02-03 20:10+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" @@ -18,93 +19,118 @@ msgstr "" "Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" -#: mat-gui:65 mat-gui:375 mat-gui:387 +#: mat-gui:61 mat-gui:403 mat-gui:422 msgid "Ready" msgstr "Gatavs" -#: mat-gui:134 +#: mat-gui:128 msgid "Choose files" msgstr "Izvēlēties datnes" -#: mat-gui:141 +#: mat-gui:135 msgid "All files" msgstr "Visas datnes" -#: mat-gui:148 +#: mat-gui:142 msgid "Supported files" msgstr "Atbalstītās datnes" -#: mat-gui:164 +#: mat-gui:157 msgid "No metadata found" msgstr "Metadati netika atrasti" -#: mat-gui:165 mat-gui:370 mat-gui:385 data/mat.ui:227 +#: mat-gui:158 mat-gui:398 mat-gui:420 msgid "Clean" msgstr "Tīrīt" -#: mat-gui:167 mat-gui:372 +#: mat-gui:160 mat-gui:400 msgid "Dirty" msgstr "Novecojis" -#: mat-gui:172 +#: mat-gui:165 #, python-format msgid "%s's metadata" msgstr "%s's metadati" -#: mat-gui:183 +#: mat-gui:176 msgid "Trash your meta, keep your data" msgstr "Atbrīvoties no meta, saglabāt Jūsu datus" -#: mat-gui:188 +#: mat-gui:181 msgid "Website" msgstr "Tīmekļa vietne" -#: mat-gui:214 data/mat.ui:107 +#: mat-gui:207 data/mat.ui:107 msgid "Preferences" msgstr "Preferences" -#: mat-gui:228 +#: mat-gui:220 msgid "Reduce PDF quality" msgstr "Samazināt PDF kvalitāti" -#: mat-gui:231 +#: mat-gui:223 msgid "Reduce the produced PDF size and quality" msgstr "Samazināt veidotā PDF lielumu un kvalitāti" -#: mat-gui:234 +#: mat-gui:226 msgid "Add unsupported file to archives" msgstr "Pievienot arhīviem neatbalstītu datni" -#: mat-gui:238 +#: mat-gui:229 msgid "Add non-supported (and so non-anonymised) file to output archive" msgstr "Pievienot izvades arhīvam neatbalstītu (un, tādējādi, neanonimizētu) datni" -#: mat-gui:283 +#: mat-gui:268 msgid "Unknown" msgstr "Nezināms" -#: mat-gui:330 +#: mat-gui:310 msgid "Not-supported" msgstr "Netiek atbalstīts" -#: mat-gui:347 -msgid "Unknown mimetype" -msgstr "Nezināms MIME veids" +#: mat-gui:324 +msgid "Harmless fileformat" +msgstr "Nekaitīgs datu formāts" + +#: mat-gui:326 +msgid "Fileformat not supported" +msgstr "Neatbalstīts datu formāts" -#: mat-gui:354 data/mat.ui:291 +#: mat-gui:329 +msgid "These files can not be processed:" +msgstr "Šīs datnes nevar apstrādāt:" + +#: mat-gui:334 mat-gui:363 data/mat.ui:292 msgid "Filename" msgstr "Datnes vārds" -#: mat-gui:356 -msgid "Mimetype" -msgstr "MIME veids" +#: mat-gui:336 +msgid "Reason" +msgstr "Iemesls" + +#: mat-gui:348 +msgid "Non-supported files in archive" +msgstr "Arhīvā atrodošās neatbalstītās datnes" + +#: mat-gui:349 data/mat.ui:227 +msgid "Scour" +msgstr "Scour" + +#: mat-gui:362 +msgid "Include" +msgstr "Iekļaut" + +#: mat-gui:378 +#, python-format +msgid "MAT is not able to clean the following files, found in the %s archive" +msgstr "MAT nespēj iztīrīt šīs datnes, kas atrastas arhīvā %syhhh" -#: mat-gui:366 +#: mat-gui:394 #, python-format msgid "Checking %s" msgstr "Pārbauda %s" -#: mat-gui:381 +#: mat-gui:409 #, python-format msgid "Cleaning %s" msgstr "Tīra %s" @@ -137,38 +163,38 @@ msgstr "Pievienot" msgid "Check" msgstr "Pārbaudīt" -#: data/mat.ui:308 +#: data/mat.ui:309 msgid "State" msgstr "Stāvoklis" -#: data/mat.ui:346 data/mat.ui:495 +#: data/mat.ui:347 data/mat.ui:499 msgid "Metadata" msgstr "Metadati" -#: data/mat.ui:400 +#: data/mat.ui:376 msgid "Name" msgstr "Nosaukums" -#: data/mat.ui:414 +#: data/mat.ui:390 msgid "Content" msgstr "Saturs" -#: data/mat.ui:448 +#: data/mat.ui:452 msgid "Supported formats" msgstr "Atbalstītie formāti" -#: data/mat.ui:482 +#: data/mat.ui:486 msgid "Support" msgstr "Atbalsts" -#: data/mat.ui:508 +#: data/mat.ui:512 msgid "Method" msgstr "Metode" -#: data/mat.ui:521 +#: data/mat.ui:525 msgid "Remaining" msgstr "Atlicis" -#: data/mat.ui:556 +#: data/mat.ui:560 msgid "Fileformat" msgstr "Datnes formāts"

1 0