summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2013-11-25 14:46:38 (GMT)
committerSwift Review <review@swift.im>2013-12-08 20:34:36 (GMT)
commit71dfdf25df27af0744e5d5ad2251397fa2bf48e5 (patch)
tree9bf6738621fcf42637c3bbcf46b3d04f88e658ba /Swift/Controllers/BlockListController.cpp
parenta0aab4b82562d58b0f1d97d42d85ba7043615f55 (diff)
downloadswift-71dfdf25df27af0744e5d5ad2251397fa2bf48e5.zip
swift-71dfdf25df27af0744e5d5ad2251397fa2bf48e5.tar.bz2
Enable domain-wise (un-)blocking.
Change-Id: I88611bead558ccb58bec8d55372f847479e745ff License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swift/Controllers/BlockListController.cpp')
-rw-r--r--Swift/Controllers/BlockListController.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/Swift/Controllers/BlockListController.cpp b/Swift/Controllers/BlockListController.cpp
index e7bc45d..6bdb513 100644
--- a/Swift/Controllers/BlockListController.cpp
+++ b/Swift/Controllers/BlockListController.cpp
@@ -145,11 +145,13 @@ void BlockListController::handleBlockListChanged() {
blockListBeforeEdit = blockListManager_->getBlockList()->getItems();
foreach (const JID& jid, jidsToBlock) {
- blockListBeforeEdit.push_back(jid);
+ if (std::find(blockListBeforeEdit.begin(), blockListBeforeEdit.end(), jid) == blockListBeforeEdit.end()) {
+ blockListBeforeEdit.push_back(jid);
+ }
}
foreach (const JID& jid, jidsToUnblock) {
- blockListBeforeEdit.erase(std::remove(blockListBeforeEdit.begin(), blockListBeforeEdit.end(), jid), blockListBeforeEdit.end());;
+ blockListBeforeEdit.erase(std::remove(blockListBeforeEdit.begin(), blockListBeforeEdit.end(), jid), blockListBeforeEdit.end());
}
blockListEditorWidget_->setCurrentBlockList(blockListBeforeEdit);