[vidalia-svn] r2001: 14:53 < arma> <nsa:#vidalia> vidalia: Set TunnelDirConns whe (in trunk: . src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-11 14:57:58 -0400 (Thu, 11 Oct 2007)
New Revision: 2001

Modified:
   trunk/
   trunk/src/config/networksettings.cpp
Log:
 r2066@lysithea:  edmanm | 2007-10-11 14:57:55 -0400
 14:53 < arma> <nsa:#vidalia> vidalia:  Set TunnelDirConns when we're using
 bridges, too.
 14:53 < arma> we should set PreferTunneledDirConns 1 too



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

Modified: trunk/src/config/networksettings.cpp
===================================================================
--- trunk/src/config/networksettings.cpp	2007-10-11 17:23:54 UTC (rev 2000)
+++ trunk/src/config/networksettings.cpp	2007-10-11 18:57:58 UTC (rev 2001)
@@ -39,6 +39,7 @@
 #define SETTING_BRIDGE_LIST         "Bridge"
 #define SETTING_UPDATE_BRIDGES      "UpdateBridgesFromAuthority"
 #define SETTING_TUNNEL_DIR_CONNS    "TunnelDirConns"
+#define SETTING_PREFER_TUNNELED_DIR_CONNS "PreferTunneledDirConns"
 
 
 /** Default constructor */
@@ -82,6 +83,7 @@
   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);
@@ -89,6 +91,7 @@
   } 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");
   }