[vidalia-svn] r2029: We still want the "My ISP is lame" checkbox to be checked if (in trunk: . src/config src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-13 20:34:34 -0400 (Sat, 13 Oct 2007)
New Revision: 2029

Modified:
   trunk/
   trunk/src/config/networksettings.cpp
   trunk/src/config/networksettings.h
   trunk/src/gui/config/networkpage.cpp
Log:
 r2119@lysithea:  edmanm | 2007-10-13 20:34:23 -0400
 We still want the "My ISP is lame" checkbox to be checked if the user has
 TunnelDirConns enabled but not UseBridges, since their Tor might know
 TunnelDirConns but not UseBridges.



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

Modified: trunk/src/config/networksettings.cpp
===================================================================
--- trunk/src/config/networksettings.cpp	2007-10-14 00:34:28 UTC (rev 2028)
+++ trunk/src/config/networksettings.cpp	2007-10-14 00:34:34 UTC (rev 2029)
@@ -55,6 +55,7 @@
   setDefault(SETTING_USE_BRIDGES,       false);
   setDefault(SETTING_BRIDGE_LIST,       QStringList());
   setDefault(SETTING_FASCIST_FIREWALL,  false);
+  setDefault(SETTING_TUNNEL_DIR_CONNS,  false);
   setDefault(SETTING_REACHABLE_ADDRESSES,
     QStringList() << "*:80" << "*:443");
 }
@@ -288,3 +289,11 @@
   setValue(SETTING_BRIDGE_LIST, bridgeList);
 }
 
+/** Returns true if Tor is configured to try to tunnel its directory
+ * connections through a one-hop circuit. */
+bool
+NetworkSettings::getTunnelDirConns()
+{
+  return value(SETTING_TUNNEL_DIR_CONNS).toBool();
+}
+

Modified: trunk/src/config/networksettings.h
===================================================================
--- trunk/src/config/networksettings.h	2007-10-14 00:34:28 UTC (rev 2028)
+++ trunk/src/config/networksettings.h	2007-10-14 00:34:34 UTC (rev 2029)
@@ -118,6 +118,10 @@
   QStringList getBridgeList();
   /** Sets to <b>bridgeList</b> the list of bridge nodes Tor should use. */
   void setBridgeList(const QStringList &bridgeList);
+
+  /** Returns true if Tor is configured to try to tunnel its directory
+   * connections through a one-hop circuit. */
+  bool getTunnelDirConns();
 };
 
 #endif

Modified: trunk/src/gui/config/networkpage.cpp
===================================================================
--- trunk/src/gui/config/networkpage.cpp	2007-10-14 00:34:28 UTC (rev 2028)
+++ trunk/src/gui/config/networkpage.cpp	2007-10-14 00:34:34 UTC (rev 2029)
@@ -340,7 +340,8 @@
   ui.lineReachablePorts->setText(reachablePortStrings.join(","));
 
   /* Load bridge settings */
-  ui.chkUseBridges->setChecked(settings.getUseBridges());
+  ui.chkUseBridges->setChecked(settings.getUseBridges() 
+                                || settings.getTunnelDirConns());
   ui.listBridges->clear();
   ui.listBridges->addItems(settings.getBridgeList());
 }