- tor-commits - lists.torproject.org

[flashproxy/master] Make the badge back into a link to the info/demo page.
by dcf＠torproject.org 09 Jul '12

09 Jul '12

commit 00a32c291788bfe047e9e3be8c24b36038227682 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 15:47:07 2012 -0700 Make the badge back into a link to the info/demo page. --- flashproxy.js | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 73133cd..eea3541 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -677,17 +677,21 @@ function Badge() { /* Number of proxy pairs currently connected. */ this.num_proxy_pairs = 0; - var img, table, tr, td; + var table, tr, td, a, img; table = document.createElement("table"); tr = document.createElement("tr"); table.appendChild(tr); td = document.createElement("td"); tr.appendChild(td); + a = document.createElement("a"); + a.setAttribute("href", "http://crypto.stanford.edu/flashproxy/"); + a.setAttribute("target", "_parent"); + td.appendChild(a); img = document.createElement("img"); img.setAttribute("src", "badge.png"); img.setAttribute("alt", "Internet freedom"); - td.appendChild(img); + a.appendChild(img); this.elem = table;

1 0

[flashproxy/master] Add badge.xcf.
by dcf＠torproject.org 09 Jul '12

09 Jul '12

commit 0dbac468a49265a4ff7b1169b47df6c84145e1d2 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 17:08:54 2012 -0700 Add badge.xcf. --- badge.xcf | Bin 0 -> 1441 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/badge.xcf b/badge.xcf new file mode 100644 index 0000000..d12ff1f Binary files /dev/null and b/badge.xcf differ

1 0

[flashproxy/master] Put all the badge colors in CSS and control them through class names.
by dcf＠torproject.org 09 Jul '12

09 Jul '12

commit 60ab5e99e639fcd28b8869e8347be93c315d0407 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 15:59:56 2012 -0700 Put all the badge colors in CSS and control them through class names. --- embed.html | 11 +++++++++++ flashproxy.js | 12 +++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/embed.html b/embed.html index 2acc381..184869f 100644 --- a/embed.html +++ b/embed.html @@ -22,8 +22,19 @@ body { border: 0; border-collapse: collapse; line-height: 0; +} +#flashproxy-badge.idle { background-color: #227; } +#flashproxy-badge.active { + background-color: #28f; +} +#flashproxy-badge.disabled { + background-color: #777; +} +#flashproxy-badge.dead { + background-color: #111; +} #flashproxy-badge td { margin: 0; padding: 0; diff --git a/flashproxy.js b/flashproxy.js index eea3541..422be89 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -694,28 +694,26 @@ function Badge() { a.appendChild(img); this.elem = table; + this.elem.className = "idle"; this.proxy_begin = function() { - if (this.num_proxy_pairs <= 0) { - this.idle_color = this.elem.getAttribute("background-color"); - } this.num_proxy_pairs++; - this.set_color("#28f"); + this.elem.className = "active"; }; this.proxy_end = function() { this.num_proxy_pairs--; if (this.num_proxy_pairs <= 0) { - this.set_color(this.idle_color); + this.elem.className = "idle"; } } this.disable = function() { - this.set_color("#777"); + this.elem.className = "disabled"; } this.die = function() { - this.set_color("#111"); + this.elem.className = "dead"; } this.set_color = function(color) {

1 0

[flashproxy/master] Provide an ✖ button to disable the badge.
by dcf＠torproject.org 09 Jul '12

09 Jul '12

commit 008bc8013eb2db6d11e6ac4bf3e814b62c1a4a51 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 16:53:19 2012 -0700 Provide an ✖ button to disable the badge. Rather than clicking anywhere on the badge to disable it, click on the ✖ that appears when you hover over it. This allows the rest of the badge to be a link to the information page. --- embed.html | 17 +++++++++++++++++ flashproxy.js | 24 +++++++++++++++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/embed.html b/embed.html index 184869f..1c4e619 100644 --- a/embed.html +++ b/embed.html @@ -36,11 +36,28 @@ body { background-color: #111; } #flashproxy-badge td { + position: relative; margin: 0; padding: 0; vertical-align: middle; text-align: center; } +#flashproxy-badge td .disable-button { + position: absolute; + margin: 0; + padding: 0; + border: 1px solid white; + color: white; + background-color: #B00; + top: 1px; + right: 1px; + width: 11px; + height: 11px; + text-align: center; + line-height: 11px; + font-size: 11px; + display: none; +} #flashproxy-badge a img { border: 0; } diff --git a/flashproxy.js b/flashproxy.js index 422be89..8f994f1 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -287,9 +287,16 @@ function make_websocket(addr) { function FlashProxy() { this.badge = new Badge(); - /* Click the badge to disable it. */ - this.badge.elem.onclick = function(event) { + this.badge.elem.onmouseover = function(event) { + this.badge.disable_button.style.display = "block"; + }.bind(this); + this.badge.elem.onmouseout = function(event) { + this.badge.disable_button.style.display = "none"; + }.bind(this); + /* Click a button to disable the badge. */ + this.badge.disable_button.onclick = function(event) { this.disable(); + this.badge.disable_button.parentNode.removeChild(this.badge.disable_button); }.bind(this); if (query.debug) this.badge_elem = debug_div; @@ -677,7 +684,7 @@ function Badge() { /* Number of proxy pairs currently connected. */ this.num_proxy_pairs = 0; - var table, tr, td, a, img; + var table, tr, td, div, a, img; table = document.createElement("table"); tr = document.createElement("tr"); @@ -696,6 +703,15 @@ function Badge() { this.elem = table; this.elem.className = "idle"; + a = document.createElement("a"); + a.setAttribute("href", "#"); + this.disable_button = document.createElement("div"); + /* HEAVY MULTIPLICATION X */ + this.disable_button.innerHTML = "✖"; + this.disable_button.className = "disable-button"; + a.appendChild(this.disable_button); + td.appendChild(a); + this.proxy_begin = function() { this.num_proxy_pairs++; this.elem.className = "active"; @@ -710,10 +726,12 @@ function Badge() { this.disable = function() { this.elem.className = "disabled"; + this.disable_button.style.display = "none"; } this.die = function() { this.elem.className = "dead"; + this.disable_button.style.display = "none"; } this.set_color = function(color) {

1 0

[flashproxy/master] Make abstract color-setting badge functions.
by dcf＠torproject.org 09 Jul '12

09 Jul '12

commit 6c1ffe81834ca762a1218795fe885cb7ce33a018 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 15:23:16 2012 -0700 Make abstract color-setting badge functions. --- flashproxy.js | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 321a708..a188e96 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -455,12 +455,12 @@ function FlashProxy() { this.make_proxy_pair = function(client_addr, relay_addr) { }; while (this.proxy_pairs.length > 0) this.proxy_pairs.pop().close(); - this.badge.set_color("#777"); + this.badge.disable(); }; this.die = function() { puts("die"); - this.badge.set_color("#111"); + this.badge.die(); }; } @@ -698,6 +698,14 @@ function Badge() { this.num_proxy_pairs--; } + this.disable = function() { + this.set_color("#777"); + } + + this.die = function() { + this.set_color("#111"); + } + this.set_color = function(color) { this.elem.style.backgroundColor = color; };

1 0

[flashproxy/master] Change the badge color to a more mellow blue.
by dcf＠torproject.org 09 Jul '12

09 Jul '12

commit 2186407063a09e7f833885caf8f344d99702e96b Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 15:39:17 2012 -0700 Change the badge color to a more mellow blue. --- embed.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/embed.html b/embed.html index aac0565..2acc381 100644 --- a/embed.html +++ b/embed.html @@ -22,7 +22,7 @@ body { border: 0; border-collapse: collapse; line-height: 0; - background-color: #d80; + background-color: #227; } #flashproxy-badge td { margin: 0;

1 0

[flashproxy/master] Make the protocol implicit in embed.html.
by dcf＠torproject.org 09 Jul '12

09 Jul '12

commit af9fb3a6ae729b43078b524671ef825194928012 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 9 17:25:17 2012 -0700 Make the protocol implicit in embed.html. --- embed.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/embed.html b/embed.html index 1c4e619..0c85f3c 100644 --- a/embed.html +++ b/embed.html @@ -80,7 +80,7 @@ body { flashproxy_badge_insert().start(); </script> <noscript> -<table id="flashproxy-badge"><tr><td><a href="http://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" alt="Internet freedom"></a></td></tr></table> +<table id="flashproxy-badge"><tr><td><a href="//crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" alt="Internet freedom"></a></td></tr></table> </noscript> </body> </html>

1 0

[vidalia/alpha] Fix includes for crypto in Linux
by chiiph＠torproject.org 09 Jul '12

09 Jul '12

commit 541371a7a36cccfee8081a2558639357fc18f1c0 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jul 9 20:19:35 2012 -0300 Fix includes for crypto in Linux --- src/common/crypto.cpp | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/common/crypto.cpp b/src/common/crypto.cpp index 5ae5295..70689a9 100644 --- a/src/common/crypto.cpp +++ b/src/common/crypto.cpp @@ -61,6 +61,11 @@ #include <wincrypt.h> #endif +#if defined(Q_OS_LINUX) +#include <stdint.h> +#include <arpa/inet.h> +#endif + /** Returns up to <b>len</b> bytes of pseudorandom data on success, or an empty * QByteArray on failure. The caller should verify that the returned

1 0

[vidalia-plugins/master] Check whether to show the tray icon message using settings
by chiiph＠torproject.org 09 Jul '12

09 Jul '12

commit 96351750f8b6dda629c970c417d313f780669cef Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jul 9 18:31:43 2012 -0300 Check whether to show the tray icon message using settings --- tbb/tbb.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbb/tbb.js b/tbb/tbb.js index d23f77c..124c855 100644 --- a/tbb/tbb.js +++ b/tbb/tbb.js @@ -343,7 +343,7 @@ var tbb = { }, showWaitDialog: function() { - if (this.chkTrayShow.checkState() == Qt.Checked) { + if (this.tab.getSetting("DontShowTrayBox", "false") != "true") { if(QSystemTrayIcon.supportsMessages()) { if (this.browserProcess.state() == QProcess.Running) { VidaliaMainWindow.

1 0

[vidalia-plugins/master] Separate -profile from the actual path
by chiiph＠torproject.org 09 Jul '12

09 Jul '12

commit 8be5414a34b2fa4f5e39b7476c7f9659b05d778c Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun May 20 19:59:07 2012 -0300 Separate -profile from the actual path --- tbb/tbb.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbb/tbb.js b/tbb/tbb.js index c034fdb..d23f77c 100644 --- a/tbb/tbb.js +++ b/tbb/tbb.js @@ -250,7 +250,7 @@ var tbb = { /* Build the command line arguments */ /* Is this better or worse than MOZ_NO_REMOTE? */ var commandLine = "-no-remote "; - commandLine += "-profile"; + commandLine += "-profile "; commandLine += "\"" + profileDir + "\""; /* Launch the browser */

1 0