[vidalia-svn] r4064: Fix another bug that resulted in the "Who has used my bridge (in vidalia/trunk: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-08-26 13:21:13 -0400 (Wed, 26 Aug 2009)
New Revision: 4064

Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/src/vidalia/config/ServerPage.cpp
Log:

Fix another bug that resulted in the "Who has used my bridge?" link
initially being visible when the user clicks "Setup Relaying" from
the control panel if they are running a non-bridge relay. (Ticket #509)
Also, always hide the "Who has used my bridge?" link when Tor isn't
running, since clicking it won't return useful information until Tor
actually is running.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2009-08-22 18:25:46 UTC (rev 4063)
+++ vidalia/trunk/CHANGELOG	2009-08-26 17:21:13 UTC (rev 4064)
@@ -5,6 +5,13 @@
     previous Vidalia installation.
   o Change all Tor event handling to use Qt's signals and slots mechanism
     instead of custom QEvent subclasses.
+  o Fix another bug that resulted in the "Who has used my bridge?" link
+    initially being visible when the user clicks "Setup Relaying" from
+    the control panel if they are running a non-bridge relay.
+    (Ticket #509, reported by "vrapp")
+  o Always hide the "Who has used my bridge?" link when Tor isn't running,
+    since clicking it won't return useful information until Tor actually
+    is running.
 
 
 0.2.2   14-Aug-2009

Modified: vidalia/trunk/src/vidalia/config/ServerPage.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/ServerPage.cpp	2009-08-22 18:25:46 UTC (rev 4063)
+++ vidalia/trunk/src/vidalia/config/ServerPage.cpp	2009-08-26 17:21:13 UTC (rev 4064)
@@ -207,7 +207,6 @@
   ui.lblYourBridgeRelayIs->setEnabled(!bridge.isEmpty());
   ui.lblBridgeIdentity->setEnabled(!bridge.isEmpty());
   ui.btnCopyBridgeIdentity->setEnabled(!bridge.isEmpty());
-  ui.lblBridgeUsage->setVisible(!bridge.isEmpty() && tc->isConnected());
 }
 
 /** Called when the user toggles any one of the server mode radio buttons
@@ -230,7 +229,8 @@
   ui.lblYourBridgeRelayIs->setVisible(bridgeEnabled);
   ui.lblBridgeIdentity->setVisible(bridgeEnabled);
   ui.btnCopyBridgeIdentity->setVisible(bridgeEnabled);
-  ui.lblBridgeUsage->setVisible(bridgeEnabled);
+  ui.lblBridgeUsage->setVisible(bridgeEnabled
+                                  && Vidalia::torControl()->isConnected());
 }
 
 /** Returns true if the user has changed their server settings since the
@@ -319,6 +319,8 @@
   ui.lineDirPort->setText(QString::number(_settings->getDirPort()));
   ui.lineServerContact->setText(_settings->getContactInfo());
   ui.chkMirrorDirectory->setChecked(_settings->isDirectoryMirror());
+  ui.lblBridgeUsage->setVisible(_settings->isBridgeEnabled()
+                                  && Vidalia::torControl()->isConnected());
 
   loadBandwidthLimits();
   loadExitPolicies();