commit 0bbd224041d764ecd7fd8caebe73b5f5feb9fe5e Author: Tomas Touceda <chiiph@gentoo.org> Date: Tue May 3 16:52:43 2011 -0300 Revert the disable checkboxes idea for usability issues The tab is disabled for both bridge and non-exit to be more clear about the fact that exit policies don't apply. Conflicts: src/vidalia/config/ServerPage.cpp --- src/vidalia/config/ServerPage.cpp | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp index f56d3d5..28308d8 100644 --- a/src/vidalia/config/ServerPage.cpp +++ b/src/vidalia/config/ServerPage.cpp @@ -259,12 +259,9 @@ ServerPage::serverModeChanged(bool enabled) ui.lineDirPort->setEnabled(!bridgeEnabled); } - ui.chkWebsites->setEnabled(!ui.rdoNonExitMode->isChecked()); - ui.chkSecWebsites->setEnabled(!ui.rdoNonExitMode->isChecked()); - ui.chkMail->setEnabled(!ui.rdoNonExitMode->isChecked()); - ui.chkIRC->setEnabled(!ui.rdoNonExitMode->isChecked()); - ui.chkIM->setEnabled(!ui.rdoNonExitMode->isChecked()); - ui.chkMisc->setEnabled(!ui.rdoNonExitMode->isChecked()); + /* Disable the Exit Policies tab when bridge or non-exit relay mode is + * selected */ + ui.tabsMenu->setTabEnabled(2, !bridgeEnabled and !ui.rdoNonExitMode->isChecked()); } /** Returns true if the user has changed their server settings since the