January 2012 - tor-commits - lists.torproject.org

[vidalia/alpha] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit f2e38a625e0b1a8d498cc7a2bfb5e42d2eabee3a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:38:38 2012 -0300 Add a changes file --- changes/bug4577 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug4577 b/changes/bug4577 new file mode 100644 index 0000000..1e92814 --- /dev/null +++ b/changes/bug4577 @@ -0,0 +1,3 @@ + o Adds a checkbox to remember the answer of a VMessageBox::question + easily. It is used to remember how the user wants to terminate tor + when running a relay. Fixes bug 4577. \ No newline at end of file

1 0

[vidalia/alpha] Merge branch 'bug4736_donotwarn' into alpha
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 9789ba9e3d97681110a75a0be0e47984ebb19f0d Merge: 04a5994 c2fad37 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:18:50 2012 -0300 Merge branch 'bug4736_donotwarn' into alpha changes/bug4736 | 3 +++ src/vidalia/MainWindow.cpp | 3 +++ src/vidalia/config/VidaliaSettings.cpp | 8 ++++++++ src/vidalia/config/VidaliaSettings.h | 3 +++ 4 files changed, 17 insertions(+), 0 deletions(-)

1 0

[vidalia/alpha] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit c2fad37aed2ae07f919084e6dddabc82a714b986 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:18:32 2012 -0300 Add a changes file --- changes/bug4736 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug4736 b/changes/bug4736 new file mode 100644 index 0000000..4b517d3 --- /dev/null +++ b/changes/bug4736 @@ -0,0 +1,3 @@ + o Add a hidden configuration option called SkipVersionCheck so + systems like Tails can force Vidalia to skip checking tor's + version. Resolves ticket 4736. \ No newline at end of file

1 0

[vidalia/alpha] Merge branch 'bug4724_httpproxy' into alpha
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit f3d84d5adcae926d046dbd4b29c441819b9d14f7 Merge: 7478260 d823576 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:44:50 2012 -0300 Merge branch 'bug4724_httpproxy' into alpha changes/bug4724 | 3 +++ src/vidalia/config/NetworkPage.cpp | 1 - src/vidalia/config/NetworkSettings.cpp | 12 ------------ src/vidalia/config/NetworkSettings.h | 5 ++--- 4 files changed, 5 insertions(+), 16 deletions(-)

1 0

[vidalia/master] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 9d475bcb5b1aedb27417dec1c96fed4d504d4513 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:47:12 2012 -0300 Add a changes file --- changes/bug4048 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4048 b/changes/bug4048 new file mode 100644 index 0000000..d138eb2 --- /dev/null +++ b/changes/bug4048 @@ -0,0 +1,2 @@ + o Attempt to remove port.conf file before using it to avoid a race + condition between tor and Vidalia. Fixes bug 4048. \ No newline at end of file

1 0

[vidalia/master] Merge branch 'bug4048_unlinkportconf_backport'
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit ab1ff7dd87c451737447d89cf483b644ef2825d0 Merge: b3775aa 9d475bc Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 13:18:29 2012 -0300 Merge branch 'bug4048_unlinkportconf_backport' changes/bug4048 | 2 ++ src/vidalia/MainWindow.cpp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[vidalia/master] Add a changes file for ticket 4907
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit d75fba954b54ff6f32e259db70813eb5245a6f62 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 13:33:43 2012 -0300 Add a changes file for ticket 4907 --- changes/bug4907 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug4907 b/changes/bug4907 new file mode 100644 index 0000000..f64b4e9 --- /dev/null +++ b/changes/bug4907 @@ -0,0 +1,3 @@ + o Fix size hints in the main window layout so that tilling window + managers display the window properly. Thanks to Mike Warren for + the fix. Fixes bug 4907. \ No newline at end of file

1 0

[vidalia/master] make main window show up properly in ratpoison with proper maximum size hint, and add pixmap + text properties properly for Qt 4.7.3+
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 28f6950f4ccba794c8d95ad7aaeba81c52151380 Author: mike warren <meejah(a)gmail.com> Date: Fri Jan 20 17:54:34 2012 -0700 make main window show up properly in ratpoison with proper maximum size hint, and add pixmap + text properties properly for Qt 4.7.3+ --- src/vidalia/MainWindow.ui | 2 +- src/vidalia/VClickLabel.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.ui b/src/vidalia/MainWindow.ui index 5668cdc..586af36 100644 --- a/src/vidalia/MainWindow.ui +++ b/src/vidalia/MainWindow.ui @@ -12,7 +12,7 @@ <property name="maximumSize" > <size> <width>16777215</width> - <height>1</height> + <height>16777215</height> </size> </property> <property name="windowTitle" > diff --git a/src/vidalia/VClickLabel.h b/src/vidalia/VClickLabel.h index daa7559..2f3e677 100644 --- a/src/vidalia/VClickLabel.h +++ b/src/vidalia/VClickLabel.h @@ -40,6 +40,12 @@ public: /** Sets the widget's image to <b>img</b>. */ void setPixmap(const QPixmap &img); + const QString& text() const { return _text; } + const QPixmap& pixmap() const { return _pixmap; } + + Q_PROPERTY(QString text READ text WRITE setText USER true); + Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap USER true); + signals: /** Emitted when the widget is left-clicked. */ void clicked();

1 0

[vidalia/master] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 58465f9b1b08bc835422e8d9129a73a0a54eb676 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:49:20 2012 -0300 Add a changes file --- changes/bug4598 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4598 b/changes/bug4598 new file mode 100644 index 0000000..89daf1d --- /dev/null +++ b/changes/bug4598 @@ -0,0 +1,2 @@ + o Explicitly disable SocksPort auto by setting it to its default + (9050). Fixes bug 4598. \ No newline at end of file

1 0

[vidalia/master] Explicitly disable SocksPort auto
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 184f638815a00101be86eaa2c5f62d27d8eff62f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 20:56:45 2012 -0300 Explicitly disable SocksPort auto --- src/vidalia/config/TorSettings.cpp | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index d45d88e..3070c09 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -59,6 +59,7 @@ #define TOR_ARG_DATA_DIRECTORY "DataDirectory" #define TOR_ARG_HASHED_PASSWORD "HashedControlPassword" #define TOR_ARG_COOKIE_AUTH "CookieAuthentication" +#define TOR_ARG_SOCKSPORT "SocksPort" /** Generate random control passwords of 16 characters */ #define PASSWORD_LEN 16 @@ -105,6 +106,11 @@ TorSettings::apply(QString *errmsg) conf.insert(SETTING_CONTROL_PORT, localValue(SETTING_CONTROL_PORT).toString()); + + if(localValue(SETTING_AUTOCONTROL).toBool()) + conf.insert(TOR_ARG_SOCKSPORT, "auto"); + else + conf.insert(TOR_ARG_SOCKSPORT, "9050"); AuthenticationMethod authMethod = toAuthenticationMethod(localValue(SETTING_AUTH_METHOD).toString());

1 0