[vidalia-svn] r2287: Don't try to ask Tor for any of the STATUS_<foo> events if t (in vidalia/trunk: . src/torcontrol)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-01-07 21:33:32 -0500 (Mon, 07 Jan 2008)
New Revision: 2287

Modified:
   vidalia/trunk/
   vidalia/trunk/src/torcontrol/torcontrol.cpp
Log:
 r19@lysithea:  edmanm | 2008-01-07 21:33:17 -0500
 Don't try to ask Tor for any of the STATUS_<foo> events if the currently
 running Tor is too old.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r19] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/src/torcontrol/torcontrol.cpp
===================================================================
--- vidalia/trunk/src/torcontrol/torcontrol.cpp	2008-01-07 18:51:01 UTC (rev 2286)
+++ vidalia/trunk/src/torcontrol/torcontrol.cpp	2008-01-08 02:33:32 UTC (rev 2287)
@@ -634,9 +634,18 @@
 TorControl::setEvents(QString *errmsg)
 {
   ControlCommand cmd("SETEVENTS"); 
+  quint32 torVersion = getTorVersion();
 
   /* Add each event to the argument list */
   foreach (TorEvents::TorEvent e, _torEvents.eventList()) {
+    if (torVersion < 0x010203
+          && (e == TorEvents::GeneralStatus
+                || e == TorEvents::ClientStatus
+                || e == TorEvents::ServerStatus)) {
+      /* Tor < 0.1.2.3-alpha does not support STATUS_GENERAL, STATUS_CLIENT
+       * and STATUS_SERVER events. */
+        continue;
+    }
     cmd.addArgument(TorEvents::toString(e));
   }
   return send(cmd, errmsg);