[vidalia-svn] r2015: Only set bridge-related options on Tor >= 0.2.0.3-alpha and (in trunk: . src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-12 15:43:26 -0400 (Fri, 12 Oct 2007)
New Revision: 2015

Modified:
   trunk/
   trunk/src/config/networksettings.cpp
Log:
 r2090@lysithea:  edmanm | 2007-10-12 15:42:59 -0400
 Only set bridge-related options on Tor >= 0.2.0.3-alpha and only if the user
 has configured one or more bridges to use.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2090] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/config/networksettings.cpp
===================================================================
--- trunk/src/config/networksettings.cpp	2007-10-12 19:43:19 UTC (rev 2014)
+++ trunk/src/config/networksettings.cpp	2007-10-12 19:43:26 UTC (rev 2015)
@@ -81,21 +81,28 @@
               localValue(SETTING_HTTPS_PROXY_AUTH).toString());
   
   if (getUseBridges()) {
-    conf.insert(SETTING_USE_BRIDGES, "1");
     conf.insert(SETTING_TUNNEL_DIR_CONNS, "1");
     conf.insert(SETTING_PREFER_TUNNELED_DIR_CONNS, "1");
-    conf.insert(SETTING_UPDATE_BRIDGES, "1");
-    foreach (QString bridge, localValue(SETTING_BRIDGE_LIST).toStringList()) {
-      conf.insert(SETTING_BRIDGE_LIST, bridge);
-    }
   } else {
-    conf.insert(SETTING_USE_BRIDGES, "0");
     conf.insert(SETTING_TUNNEL_DIR_CONNS, "0");
     conf.insert(SETTING_PREFER_TUNNELED_DIR_CONNS, "0");
-    conf.insert(SETTING_BRIDGE_LIST, "");
-    conf.insert(SETTING_UPDATE_BRIDGES, "0");
   }
-
+  
+  if (_torControl->getTorVersion() >= 0x020003) {
+    /* Do the bridge stuff only on Tor >= 0.2.0.3-alpha */
+    QStringList bridges = localValue(SETTING_BRIDGE_LIST).toStringList();
+    if (getUseBridges() && !bridges.isEmpty()) {
+      conf.insert(SETTING_USE_BRIDGES, "1");
+      conf.insert(SETTING_UPDATE_BRIDGES, "1");
+      foreach (QString bridge, bridges) {
+        conf.insert(SETTING_BRIDGE_LIST, bridge);
+      }
+    } else {
+      conf.insert(SETTING_USE_BRIDGES, "0");
+      conf.insert(SETTING_BRIDGE_LIST, "");
+      conf.insert(SETTING_UPDATE_BRIDGES, "0");
+    }
+  }
   return _torControl->setConf(conf, errmsg);
 }