[vidalia-svn] r1514: Points on the network map are keyed by keyid sans "$", so st (trunk/src/gui/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-12-10 01:10:13 -0500 (Sun, 10 Dec 2006)
New Revision: 1514

Modified:
   trunk/src/gui/network/netviewer.cpp
Log:
Points on the network map are keyed by keyid sans "$", so strip the "$" 
whenever we get a circ event that includes a keyid for a non-Named server. 
This was causing some circuits to not actually get mapped. (Ticket #175)


Modified: trunk/src/gui/network/netviewer.cpp
===================================================================
--- trunk/src/gui/network/netviewer.cpp	2006-12-10 04:58:58 UTC (rev 1513)
+++ trunk/src/gui/network/netviewer.cpp	2006-12-10 06:10:13 UTC (rev 1514)
@@ -431,7 +431,10 @@
 
   torVersion = _torControl->getTorVersion();
   foreach (QString hop, path) {
-    if (!hop.startsWith("$")) {
+    if (hop.startsWith("$")) {
+      /* This hop is already specified as a keyid, so just strip the "$" */
+      hop.remove(0,1);
+    } else {
       if (torVersion < 0x00010202) {
         /* Tor versions earlier than 0.1.2.2 have a bug where they will tell
          * you a server's nickname in a circuit, even if that server is