[vidalia-svn] r2183: New Tors now say "OBSOLETE" instead of "OLD" in DANGEROUS_VE (in trunk: . src/control src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-05 14:54:02 -0500 (Wed, 05 Dec 2007)
New Revision: 2183

Modified:
   trunk/
   trunk/src/control/dangerousversionevent.cpp
   trunk/src/control/dangerousversionevent.h
   trunk/src/gui/mainwindow.cpp
Log:
 r2240@lysithea:  edmanm | 2007-12-05 14:53:56 -0500
 New Tors now say "OBSOLETE" instead of "OLD" in DANGEROUS_VERSION events, so
 we'll tolerate both.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2240] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/src/control/dangerousversionevent.cpp
===================================================================
--- trunk/src/control/dangerousversionevent.cpp	2007-12-05 18:23:15 UTC (rev 2182)
+++ trunk/src/control/dangerousversionevent.cpp	2007-12-05 19:54:02 UTC (rev 2183)
@@ -35,8 +35,9 @@
 {
   if (!str.compare("UNRECOMMENDED", Qt::CaseInsensitive))
     return UnrecommendedVersion;
-  if (!str.compare("OLD", Qt::CaseInsensitive))
-    return OldVersion;
+  if (!str.compare("OLD", Qt::CaseInsensitive)
+        || !str.compare("OBSOLETE", Qt::CaseInsensitive))
+    return ObsoleteVersion;
   if (!str.compare("NEW", Qt::CaseInsensitive))
     return NewVersion;
   return UnrecognizedReason;

Modified: trunk/src/control/dangerousversionevent.h
===================================================================
--- trunk/src/control/dangerousversionevent.h	2007-12-05 18:23:15 UTC (rev 2182)
+++ trunk/src/control/dangerousversionevent.h	2007-12-05 19:54:02 UTC (rev 2183)
@@ -40,8 +40,8 @@
     UnrecognizedReason, 
     NewVersion, /**< The current version is newer than any recommended
                      version. */
-    OldVersion, /**< The current version is older than any recommended 
-                     version. */
+    ObsoleteVersion, /**< The current version is older than any recommended 
+                          version. */
     UnrecommendedVersion /**< The current version of Tor should not be used. */
   };
 

Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2007-12-05 18:23:15 UTC (rev 2182)
+++ trunk/src/gui/mainwindow.cpp	2007-12-05 19:54:02 UTC (rev 2183)
@@ -217,7 +217,7 @@
     
     if (gse && gse->status() == GeneralStatusEvent::DangerousTorVersion) {
       DangerousVersionEvent *dve = dynamic_cast<DangerousVersionEvent *>(gse);
-      if (dve && (dve->reason() == DangerousVersionEvent::OldVersion
+      if (dve && (dve->reason() == DangerousVersionEvent::ObsoleteVersion
            || dve->reason() == DangerousVersionEvent::UnrecommendedVersion)) {
         dangerousTorVersion();
       }