Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-05-08 17:13:42 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-05-08 17:13:42 (GMT) |
| commit | fc7c2dd9140b38df288450a4732297b53188e87a (patch) | |
| tree | 2d928c5b211451c33dad0174727945234b4bae48 | |
| parent | eb6a3e659254de70b7c45627e7e0f4f53b737d04 (diff) | |
| download | swift-fc7c2dd9140b38df288450a4732297b53188e87a.zip swift-fc7c2dd9140b38df288450a4732297b53188e87a.tar.bz2 | |
Remove duplicate MUCBookmark structure.
| -rw-r--r-- | Swiften/MUC/MUCBookmarkManager.cpp | 3 | ||||
| -rw-r--r-- | Swiften/MUC/MUCBookmarkManager.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Swiften/MUC/MUCBookmarkManager.cpp b/Swiften/MUC/MUCBookmarkManager.cpp index 400eb2b..aa8f026 100644 --- a/Swiften/MUC/MUCBookmarkManager.cpp +++ b/Swiften/MUC/MUCBookmarkManager.cpp @@ -25,6 +25,8 @@ void MUCBookmarkManager::handleBookmarksReceived(boost::shared_ptr<Storage> payl if (error) { return; } + storage = payload; + std::vector<MUCBookmark> receivedBookmarks; foreach (Storage::Conference conference, payload->getConferences()) { String name = (!conference.name.isEmpty()) ? conference.name : conference.jid.getNode(); @@ -81,7 +83,6 @@ void MUCBookmarkManager::addBookmark(const MUCBookmark& bookmark) { void MUCBookmarkManager::removeBookmark(const MUCBookmark& bookmark) { - // FIXME: Clean this up using proper STL std::vector<MUCBookmark>::iterator it; for (it = bookmarks_.begin(); it != bookmarks_.end(); it++) { if ((*it) == bookmark) { diff --git a/Swiften/MUC/MUCBookmarkManager.h b/Swiften/MUC/MUCBookmarkManager.h index ffa903f..594a805 100644 --- a/Swiften/MUC/MUCBookmarkManager.h +++ b/Swiften/MUC/MUCBookmarkManager.h @@ -41,5 +41,6 @@ namespace Swift { private: std::vector<MUCBookmark> bookmarks_; IQRouter* iqRouter_; + boost::shared_ptr<Storage> storage; }; } |