[Pkg-privacy-commits] [vidalia] 129/160: New patches cherry-picked from upstream: Fix-wrong-uptime-bandwidth-in-relay-list.patch (Closes: #699178) and Populate-the-relay-list-at-startup.patch (Closes: #699179).

[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 8e8981b63b839fd15139a60b68590fa023893542
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Jan 28 17:34:23 2013 +0100

    New patches cherry-picked from upstream: Fix-wrong-uptime-bandwidth-in-relay-list.patch (Closes: #699178) and Populate-the-relay-list-at-startup.patch (Closes: #699179).
    
      * Populate the relay list at startup (Closes: #699179)
    
        This is taken from upstream commit b00f51dc, but with the fix for upstream
        Trac#6482 (that doesn't seem worth a freeze exception) and the changes/*
        file removed.
    
      * Fix wrong uptime/bandwidth in relay list (Closes: #699178).
    
        This is upstream commit b3d4f7f with the changes/* file removed.
---
 .../Fix-wrong-uptime-bandwidth-in-relay-list.patch | 52 ++++++++++++++++++++++
 .../Populate-the-relay-list-at-startup.patch       | 27 +++++++++++
 debian/patches/series                              |  2 +
 3 files changed, 81 insertions(+)

diff --git a/debian/patches/Fix-wrong-uptime-bandwidth-in-relay-list.patch b/debian/patches/Fix-wrong-uptime-bandwidth-in-relay-list.patch
new file mode 100644
index 0000000..9f71d98
--- /dev/null
+++ b/debian/patches/Fix-wrong-uptime-bandwidth-in-relay-list.patch
@@ -0,0 +1,52 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Mon, 28 Jan 2013 17:24:47 +0100
+Subject: Fix wrong uptime/bandwidth in relay list (Closes: #699178).
+
+This is upstream commit b3d4f7f with the changes/* file removed.
+---
+ src/torcontrol/RouterDescriptor.cpp          |    7 ++++---
+ src/vidalia/network/RouterDescriptorView.cpp |    8 +++++---
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/torcontrol/RouterDescriptor.cpp b/src/torcontrol/RouterDescriptor.cpp
+index 26051c1..2c2b147 100644
+--- a/src/torcontrol/RouterDescriptor.cpp
++++ b/src/torcontrol/RouterDescriptor.cpp
+@@ -106,7 +106,8 @@ RouterDescriptor::appendRouterStatusInfo(const RouterStatus &rs)
+   _ip = rs.ipAddress();
+   _orPort = rs.orPort();
+   _dirPort = rs.dirPort();
+-  _avgBandwidth = rs.bandwidth();
+-  _burstBandwidth = rs.bandwidth();
+-  _observedBandwidth = rs.bandwidth();
++  _avgBandwidth = rs.bandwidth() * 1024;
++  _burstBandwidth = rs.bandwidth() * 1024;
++  _observedBandwidth = rs.bandwidth() * 1024;
++  _published = rs.published();
+ }
+diff --git a/src/vidalia/network/RouterDescriptorView.cpp b/src/vidalia/network/RouterDescriptorView.cpp
+index bb4b19d..8700612 100644
+--- a/src/vidalia/network/RouterDescriptorView.cpp
++++ b/src/vidalia/network/RouterDescriptorView.cpp
+@@ -106,7 +106,8 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist)
+ 
+     /* Add the IP address and router platform information */
+     html.append(trow(tcol(b(tr("IP Address:"))) + tcol(rd.ip().toString())));
+-    html.append(trow(tcol(b(tr("Platform:")))   + tcol(rd.platform())));
++    if (!rd.platform().isEmpty())
++      html.append(trow(tcol(b(tr("Platform:")))   + tcol(rd.platform())));
+ 
+     /* If the router is online, then show the uptime and bandwidth stats. */
+     if (!rd.offline()) {
+@@ -121,8 +122,9 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist)
+     }
+ 
+     /* Date the router was published */
+-    html.append(trow(tcol(b(tr("Last Updated:")))  +
+-                     tcol(string_format_datetime(rd.published()) + " GMT")));
++    if (!rd.published().isNull())
++      html.append(trow(tcol(b(tr("Last Updated:")))  +
++                       tcol(string_format_datetime(rd.published()) + " GMT")));
+ 
+     html.append("</table>");
+ 
diff --git a/debian/patches/Populate-the-relay-list-at-startup.patch b/debian/patches/Populate-the-relay-list-at-startup.patch
new file mode 100644
index 0000000..b7f244d
--- /dev/null
+++ b/debian/patches/Populate-the-relay-list-at-startup.patch
@@ -0,0 +1,27 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Mon, 28 Jan 2013 17:31:03 +0100
+Subject: Populate the relay list at startup (Closes: #699179)
+
+This is taken from upstream commit b00f51dc, but with the fix for upstream
+Trac#6482 (that doesn't seem worth a freeze exception) and the changes/*
+file removed.
+---
+ src/vidalia/network/NetViewer.cpp |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp
+index 1d48b96..cfba2ea 100644
+--- a/src/vidalia/network/NetViewer.cpp
++++ b/src/vidalia/network/NetViewer.cpp
+@@ -312,6 +312,11 @@ void
+ NetViewer::loadNetworkStatus()
+ {
+   NetworkStatus networkStatus = _torControl->getNetworkStatus();
++  if (networkStatus.isEmpty()) {
++    _refreshTimer.setInterval(2000);
++  } else {
++    _refreshTimer.setInterval(60*60*1000);
++  }
+ 
+   bool usingMicrodescriptors = _torControl->useMicrodescriptors();
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a608de8..c2d9477 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 debians-tor-binary-path.patch
 use-control-socket.patch
+Fix-wrong-uptime-bandwidth-in-relay-list.patch
+Populate-the-relay-list-at-startup.patch

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