[vidalia-svn] r2435: Stop requiring a dirport for bridge relays. Fixes the easy p (in vidalia/trunk: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-03-21 22:52:30 -0400 (Fri, 21 Mar 2008)
New Revision: 2435

Modified:
   vidalia/trunk/
   vidalia/trunk/CHANGELOG
   vidalia/trunk/src/vidalia/config/serverpage.cpp
Log:
 r242@lysithea:  edmanm | 2008-03-21 22:52:25 -0400
 Stop requiring a dirport for bridge relays. Fixes the easy part of ticket
 #337.



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

Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2008-03-22 02:30:51 UTC (rev 2434)
+++ vidalia/trunk/CHANGELOG	2008-03-22 02:52:30 UTC (rev 2435)
@@ -3,6 +3,10 @@
     GeoIP server. This caused Vidalia >= 0.1.0 clients built against Qt >=
     4.3.2 to be unable to retrieve updated GeoIP information. (Ticket #349)
   o Fix compilation when UINT_MAX is not defined. (Ticket #350)
+  o Bridges are no longer required to have a DirPort set as of Tor
+    0.2.0.13-alpha, so stop forcing it on for bridges. At some point, we'll
+    likely start forcing DirPort to be disabled for bridges, and on by default
+    but optional for normal relays. (Ticket #337)
   o Update the version of Torbutton included in the OS X bundle to
     1.1.17-alpha, and actually include the bundle's uninstaller script.
   o Updated Finnish and Swedish translations.

Modified: vidalia/trunk/src/vidalia/config/serverpage.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/serverpage.cpp	2008-03-22 02:30:51 UTC (rev 2434)
+++ vidalia/trunk/src/vidalia/config/serverpage.cpp	2008-03-22 02:52:30 UTC (rev 2435)
@@ -202,11 +202,6 @@
   ui.lblYourBridgeRelayIs->setVisible(bridgeEnabled);
   ui.lblBridgeIdentity->setVisible(bridgeEnabled);
   ui.btnCopyBridgeIdentity->setVisible(bridgeEnabled);
-  
-  /* Bridges must have a dirport set */
-  ui.chkMirrorDirectory->setChecked(
-    ui.chkMirrorDirectory->isChecked() || bridgeEnabled);
-  ui.chkMirrorDirectory->setEnabled(!bridgeEnabled);
 }
 
 /** Returns true if the user has changed their server settings since the