[vidalia-svn] r1998: Set TunnelDirConns when we're using bridges, too. (in trunk: . src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-11 12:54:28 -0400 (Thu, 11 Oct 2007)
New Revision: 1998

Modified:
   trunk/
   trunk/src/config/networksettings.cpp
Log:
 r2060@lysithea:  edmanm | 2007-10-11 12:54:25 -0400
 Set TunnelDirConns when we're using bridges, too.



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

Modified: trunk/src/config/networksettings.cpp
===================================================================
--- trunk/src/config/networksettings.cpp	2007-10-11 16:45:10 UTC (rev 1997)
+++ trunk/src/config/networksettings.cpp	2007-10-11 16:54:28 UTC (rev 1998)
@@ -38,6 +38,7 @@
 #define SETTING_USE_BRIDGES         "UseBridges"
 #define SETTING_BRIDGE_LIST         "Bridge"
 #define SETTING_UPDATE_BRIDGES      "UpdateBridgesFromAuthority"
+#define SETTING_TUNNEL_DIR_CONNS    "TunnelDirConns"
 
 
 /** Default constructor */
@@ -80,12 +81,14 @@
   
   if (getUseBridges()) {
     conf.insert(SETTING_USE_BRIDGES, "1");
+    conf.insert(SETTING_TUNNEL_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_BRIDGE_LIST, "");
     conf.insert(SETTING_UPDATE_BRIDGES, "0");
   }