[tor-commits] [vidalia/alpha] Merge branch 'macfixups' into alpha

[chiiph at torproject.org]

commit 948a49292bce6a58de9bf807bf69ec4a4ed73204
Merge: ee578db 615efa3
Author: Tomas Touceda <chiiph at torproject.org>
Date:   Sat Jun 11 12:34:19 2011 -0300

    Merge branch 'macfixups' into alpha

 src/vidalia/config/AdvancedPage.ui |  110 +++++++++++++++------------------
 src/vidalia/config/ServerPage.cpp  |    3 +
 src/vidalia/config/ServerPage.ui   |   89 +++++++++++---------------
 src/vidalia/config/TorrcDialog.ui  |  120 +++++++++++++++++++++++-------------
 4 files changed, 169 insertions(+), 153 deletions(-)

diff --cc src/vidalia/config/ServerPage.cpp
index 32dc152,e026435..67e79ee
--- a/src/vidalia/config/ServerPage.cpp
+++ b/src/vidalia/config/ServerPage.cpp
@@@ -238,18 -235,8 +238,21 @@@ ServerPage::serverModeChanged(bool enab
    ui.lblBridgeUsage->setVisible(bridgeEnabled
                                    && Vidalia::torControl()->isConnected());
  
 +  if(bridgeEnabled) {
 +    if(ui.lineDirPort->text().length() != 0) {
 +      _tmpDirPort = ui.lineDirPort->text();
 +      _tmpMirror = ui.chkMirrorDirectory->isChecked();
 +    }
 +    ui.lineDirPort->clear();
 +    ui.chkMirrorDirectory->setChecked(false);
 +  } else {
 +    ui.lineDirPort->setText(_tmpDirPort);
 +    ui.chkMirrorDirectory->setChecked(_tmpMirror);
 +  }
 +
+   ui.lineDirPort->setEnabled(!bridgeEnabled);
+   ui.lblDirPort->setEnabled(!bridgeEnabled);
++
    ui.chkMirrorDirectory->setEnabled(!bridgeEnabled);
  
    /* Disable the Exit Policies tab when bridge or non-exit relay mode is