Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-01-22 22:24:16 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-02-16 16:55:03 (GMT) |
| commit | 645a7a47c8105e7cad3fecd7bb66c8c16757eafe (patch) | |
| tree | 3230a784bddfa6b7fd5d327e735451e625672af4 /Swift/QtUI/QtChatWindow.cpp | |
| parent | 45eec1d00d5b9fabee1ce44f7dd8addd7d0cf6b3 (diff) | |
| download | swift-645a7a47c8105e7cad3fecd7bb66c8c16757eafe.zip swift-645a7a47c8105e7cad3fecd7bb66c8c16757eafe.tar.bz2 | |
Show a warning notice when trying to enter a blocked room
When the user tries to enter a blocked room, we now show a warning
notice and describing how the room can be unblocked. Swift will not
send the joining presence when trying to enter a blocked room.
Test-Information:
Tested on Mac OS X 10.9.5 against a popular open source server and its
MUC and Blocking Command implementation.
Change-Id: I875db056f21f97845c5a9a43167b0f2a16bdaa36
Diffstat (limited to 'Swift/QtUI/QtChatWindow.cpp')
| -rw-r--r-- | Swift/QtUI/QtChatWindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp index 6324e9d..33bec75 100644 --- a/Swift/QtUI/QtChatWindow.cpp +++ b/Swift/QtUI/QtChatWindow.cpp @@ -653,7 +653,7 @@ void QtChatWindow::handleActionButtonClicked() { unblock = contextMenu.addAction(tr("Unblock")); unblock->setEnabled(isOnline_); } - else if (blockingState_ == IsUnblocked) { + else if (!isMUC_ && blockingState_ == IsUnblocked) { block = contextMenu.addAction(tr("Block")); block->setEnabled(isOnline_); } |