[vidalia-svn] r3771: Backport the guessti-patch in r3770. (in vidalia/branches/vidalia-0.1: . src/vidalia/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-05-13 22:47:39 -0400 (Wed, 13 May 2009)
New Revision: 3771

Modified:
   vidalia/branches/vidalia-0.1/
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/vidalia/network/routerdescriptorview.cpp
Log:

Backport the guessti-patch in r3770.



Property changes on: vidalia/branches/vidalia-0.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/trunk:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3732,3740,3745,3754
/vidalia/trunk/cmake:3745
   + /vidalia/trunk:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3643,3732,3740,3745,3754
/vidalia/trunk/cmake:3745

Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-05-14 02:41:24 UTC (rev 3770)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-05-14 02:47:39 UTC (rev 3771)
@@ -2,7 +2,7 @@
   o Remove an old warning on the relay settings page that running a bridge
     relay requires Tor 0.2.0.8-alpha or newer.
   o Add a workaround for a bug that prevented Vidalia's tray icon from
-    getting adding to the system notification area on Gnome when Vidalia was
+    getting added to the system notification area on Gnome when Vidalia was
     run on system startup. Patch by Steve Tyree. (Ticket #247)
   o Fix a bug that prevented the control panel from displaying when
     running on the Enlightenment window manager. Patch by Steve Tyree.
@@ -13,6 +13,8 @@
   o Use the TorProcess subclass of QProcess for launching Tor when hashing
     a control password so we can take advantage of its PATH+=:/usr/sbin
     trick on Debian there too.
+  o If a RouterDescriptor object is empty, don't try to display it in the
+    router descriptor details viewer. (Ticket #479)
 
 
 0.1.12  16-Mar-2009

Modified: vidalia/branches/vidalia-0.1/src/vidalia/network/routerdescriptorview.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/network/routerdescriptorview.cpp	2009-05-14 02:41:24 UTC (rev 3770)
+++ vidalia/branches/vidalia-0.1/src/vidalia/network/routerdescriptorview.cpp	2009-05-14 02:47:39 UTC (rev 3771)
@@ -127,6 +127,8 @@
   
   for (int r = 0; r < rdlist.size(); r++) { 
     rd = rdlist.at(r);
+    if (rd.isEmpty())
+      continue;
     
     /* Router name and status */
     html.append(p(b(rd.name()) + " (" + i(rd.status()) + ")"));


Property changes on: vidalia/branches/vidalia-0.1/src/vidalia/network/routerdescriptorview.cpp
___________________________________________________________________
Added: svn:mergeinfo
   + /vidalia/trunk/cmake/src/vidalia/network/routerdescriptorview.cpp:3745
/vidalia/trunk/src/vidalia/network/RouterDescriptorView.cpp:3770
/vidalia/trunk/src/vidalia/network/routerdescriptorview.cpp:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3643,3732,3740,3745,3754