diff options
| author | Thorvald Natvig <slicer@users.sourceforge.net> | 2010-10-02 18:31:24 +0400 |
|---|---|---|
| committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2010-10-02 18:31:24 +0400 |
| commit | 0e5292b1f4baf8ce2e4756867e8f1e87af7272a7 (patch) | |
| tree | 420141842421697eefff2d45549e0d7ce84b691d /src/mumble/ACLEditor.cpp | |
| parent | ac49c60707b6570568a7dc4e22354527d38e18ed (diff) | |
Indent, changelog, submodule and language update
Diffstat (limited to 'src/mumble/ACLEditor.cpp')
| -rw-r--r-- | src/mumble/ACLEditor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mumble/ACLEditor.cpp b/src/mumble/ACLEditor.cpp index 36bf0d05e..c9f4e78a2 100644 --- a/src/mumble/ACLEditor.cpp +++ b/src/mumble/ACLEditor.cpp @@ -638,8 +638,8 @@ void ACLEditor::updatePasswordField() { (*i)->bApplyHere && !(*i)->bInherited && ((*i)->pAllow & ChanACL::Enter) && - ((*i)->pAllow == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel) || // Backwards compat with old behaviour that didn't deny traverse - (*i)->pAllow == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel | ChanACL::Traverse)) && + ((*i)->pAllow == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel) || // Backwards compat with old behaviour that didn't deny traverse + (*i)->pAllow == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel | ChanACL::Traverse)) && (*i)->pDeny == ChanACL::None) { qleChannelPassword->setText((*i)->qsGroup.mid(1)); pcaPassword = (*i); @@ -663,8 +663,8 @@ void ACLEditor::updatePasswordACL() { (*i)->bInherited == false && (*i)->bApplyHere == true && (*i)->pAllow == ChanACL::None && - ((*i)->pDeny == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel) || // Backwards compat with old behaviour that didn't deny traverse - (*i)->pDeny == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel | ChanACL::Traverse))) { + ((*i)->pDeny == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel) || // Backwards compat with old behaviour that didn't deny traverse + (*i)->pDeny == (ChanACL::Enter | ChanACL::Speak | ChanACL::Whisper | ChanACL::TextMessage | ChanACL::LinkChannel | ChanACL::Traverse))) { qlACLs.removeOne(*i); delete(*i); break; |