[vidalia-svn] r2131: Disable the labels that display the user's bridge relay info (in trunk: . src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-11-22 16:23:37 -0500 (Thu, 22 Nov 2007)
New Revision: 2131

Modified:
   trunk/
   trunk/CHANGELOG
   trunk/src/gui/config/serverpage.cpp
Log:
 r2149@lysithea:  edmanm | 2007-11-22 16:23:21 -0500
 Disable the labels that display the user's bridge relay information if the
 user is not running a bridge, instead of just disabling the copy button.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2149] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2007-11-22 19:39:17 UTC (rev 2130)
+++ trunk/CHANGELOG	2007-11-22 21:23:37 UTC (rev 2131)
@@ -17,6 +17,8 @@
   o Update the default bandwidth rate and burst rate to 5MB and 10MB,
     respectively, to match Tor's defaults.
   o Make the "Use this proxy for HTTPS also" checkbox checked by default.
+  o Disable the labels that display the user's bridge relay information if the
+    user is not running a bridge, instead of just disabling the copy button.
   o Modified the Mac OS X bundle installer to set Vidalia to start
     automatically on login for the user that installed the bundle.
   o Added an Arabic translation from Ahmad Gharbeia.

Modified: trunk/src/gui/config/serverpage.cpp
===================================================================
--- trunk/src/gui/config/serverpage.cpp	2007-11-22 19:39:17 UTC (rev 2130)
+++ trunk/src/gui/config/serverpage.cpp	2007-11-22 21:23:37 UTC (rev 2131)
@@ -193,6 +193,8 @@
   ui.lblBridgeIdentity->setText(bridge.isEmpty()
                                   ? tr("Your bridge relay is not running.")
                                   : bridge);
+  ui.lblYourBridgeRelayIs->setEnabled(!bridge.isEmpty());
+  ui.lblBridgeIdentity->setEnabled(!bridge.isEmpty());
   ui.btnCopyBridgeIdentity->setEnabled(!bridge.isEmpty());
 }