Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-03-28 13:36:48 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-03-28 13:36:48 (GMT) |
| commit | dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8 (patch) | |
| tree | f01fe3ff891a815b7c7db511ddbabcc67f916445 /Swiften/MUC/MUCBookmarkManager.cpp | |
| parent | a7d213975040a1130ac136d61a055c5b6f5d41fa (diff) | |
| parent | a59af6c6daa72dd491189335cf2d255a788eb0f6 (diff) | |
| download | swift-contrib-dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8.zip swift-contrib-dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8.tar.bz2 | |
Merge commit 'origin/master'
Conflicts:
BuildTools
Diffstat (limited to 'Swiften/MUC/MUCBookmarkManager.cpp')
| -rw-r--r-- | Swiften/MUC/MUCBookmarkManager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Swiften/MUC/MUCBookmarkManager.cpp b/Swiften/MUC/MUCBookmarkManager.cpp index f789300..f9295e2 100644 --- a/Swiften/MUC/MUCBookmarkManager.cpp +++ b/Swiften/MUC/MUCBookmarkManager.cpp @@ -11,6 +11,7 @@ MUCBookmarkManager::MUCBookmarkManager(IQRouter* iqRouter) { void MUCBookmarkManager::addBookmark(boost::shared_ptr<MUCBookmark> bookmark) { bookmarks_.push_back(bookmark); flush(); + onBookmarkAdded(bookmark); } @@ -19,6 +20,7 @@ void MUCBookmarkManager::removeBookmark(boost::shared_ptr<MUCBookmark> bookmark) for (it = bookmarks_.begin(); it != bookmarks_.end(); it++) { if ((*it).get() == bookmark.get()) { bookmarks_.erase(it); + onBookmarkRemoved(bookmark); return; } } |