[Pkg-privacy-commits] [vidalia] 87/160: Do not warn about Tor version.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository vidalia.

commit e1d34fbb8ea7e3b7dbc227f5866d36fb91d517a4
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Nov 28 15:36:27 2011 +0100

    Do not warn about Tor version.
    
    Tails has its own security warning system, and Vidalia's one advises users
    upgrade actions that are not appropriate in the context of Tails.
---
 debian/changelog                                   |  1 +
 debian/patches/Do-not-warn-about-Tor-version.patch | 73 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 75 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a1cd7e0..3fd3d5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ vidalia (0.2.15-1+tails1) unstable; urgency=low
     - network settings are displayed on startup if needed
     - UseBridges is enabled
     - a Tails-specifig pop-up is shown.
+  * Do not warn about Tor version.
 
  -- intrigeri <intrigeri+debian at boum.org>  Tue, 30 Aug 2011 15:44:49 +0200
 
diff --git a/debian/patches/Do-not-warn-about-Tor-version.patch b/debian/patches/Do-not-warn-about-Tor-version.patch
new file mode 100644
index 0000000..89fd3d6
--- /dev/null
+++ b/debian/patches/Do-not-warn-about-Tor-version.patch
@@ -0,0 +1,73 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Mon, 28 Nov 2011 11:47:51 +0100
+Subject: Do not warn about Tor version.
+
+Tails has its own security warning system, and Vidalia's one advises users
+upgrade actions that are not appropriate in the context of Tails.
+---
+ src/vidalia/MainWindow.cpp            |   12 +-----------
+ src/vidalia/log/StatusEventWidget.cpp |   13 -------------
+ 2 files changed, 1 insertions(+), 24 deletions(-)
+
+diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
+index 4f0225b..caefca9 100644
+--- a/src/vidalia/MainWindow.cpp
++++ b/src/vidalia/MainWindow.cpp
+@@ -147,10 +147,6 @@ MainWindow::MainWindow()
+           this, SLOT(authenticationFailed(QString)));
+ 
+   _torControl->setEvent(TorEvents::GeneralStatus);
+-  connect(_torControl, SIGNAL(dangerousTorVersion(tc::TorVersionStatus,
+-                                                  QString, QStringList)),
+-          this, SLOT(dangerousTorVersion(tc::TorVersionStatus,
+-                                         QString, QStringList)));
+ 
+   _torControl->setEvent(TorEvents::ClientStatus);
+   connect(_torControl, SIGNAL(bootstrapStatusChanged(BootstrapStatus)),
+@@ -1572,13 +1568,7 @@ void
+ MainWindow::checkTorVersion()
+ {
+   QString status;
+-  if (_torControl->getInfo("status/version/current", status)) {
+-    if (!status.compare("old", Qt::CaseInsensitive)
+-          || !status.compare("unrecommended", Qt::CaseInsensitive)
+-          || !status.compare("obsolete", Qt::CaseInsensitive)) {
+-      displayTorVersionWarning();
+-    }
+-  }
++  _torControl->getInfo("status/version/current", status);
+ }
+ 
+ /** Called when Tor thinks its version is old or unrecommended, and displays
+diff --git a/src/vidalia/log/StatusEventWidget.cpp b/src/vidalia/log/StatusEventWidget.cpp
+index 4bd11d0..b1c72cb 100644
+--- a/src/vidalia/log/StatusEventWidget.cpp
++++ b/src/vidalia/log/StatusEventWidget.cpp
+@@ -48,10 +48,6 @@ StatusEventWidget::StatusEventWidget(QWidget *parent)
+           this, SLOT(customContextMenuRequested(QPoint)));
+   connect(tc, SIGNAL(authenticated()), this, SLOT(authenticated()));
+   connect(tc, SIGNAL(disconnected()), this, SLOT(disconnected()));
+-  connect(tc, SIGNAL(dangerousTorVersion(tc::TorVersionStatus, QString,
+-                                         QStringList)),
+-          this, SLOT(dangerousTorVersion(tc::TorVersionStatus, QString,
+-                                         QStringList)));
+   connect(tc, SIGNAL(circuitEstablished()), this, SLOT(circuitEstablished()));
+   connect(tc, SIGNAL(bug(QString)), this, SLOT(bug(QString)));
+   connect(tc, SIGNAL(clockSkewed(int, QString)),
+@@ -272,15 +268,6 @@ StatusEventWidget::authenticated()
+   // in which case we missed the CIRCUIT_ESTABLISHED event. So fake it.
+   if (tc->isCircuitEstablished())
+     circuitEstablished();
+-
+-  // Check on the status of Tor's version, in case we missed that event too
+-  QString status = tc->getInfo("status/version/current").toString();
+-  if (! status.compare("old", Qt::CaseInsensitive)
+-        || ! status.compare("obsolete", Qt::CaseInsensitive)) {
+-    dangerousTorVersion(tc::ObsoleteTorVersion, version, QStringList());
+-  } else if (! status.compare("unrecommended", Qt::CaseInsensitive)) {
+-    dangerousTorVersion(tc::UnrecommendedTorVersion, version, QStringList());
+-  }
+ }
+ 
+ void
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 9e38729..eddd00d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+Do-not-warn-about-Tor-version.patch
 debians-tor-binary-path.patch
 vidalia-bridgeconf.patch
 tails-remove-useless-controls.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git