summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-05-08 17:18:21 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-05-08 17:22:18 (GMT)
commit09de88ddd4377a53a880b98d63bbe391eba982b9 (patch)
treebaa45c64b17eff11c22be25ba52271ee822268fd /Swiften/MUC/MUCBookmarkManager.cpp
parentfc7c2dd9140b38df288450a4732297b53188e87a (diff)
downloadswift-contrib-09de88ddd4377a53a880b98d63bbe391eba982b9.zip
swift-contrib-09de88ddd4377a53a880b98d63bbe391eba982b9.tar.bz2
Renamed Conference->Room.
Diffstat (limited to 'Swiften/MUC/MUCBookmarkManager.cpp')
-rw-r--r--Swiften/MUC/MUCBookmarkManager.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/MUC/MUCBookmarkManager.cpp b/Swiften/MUC/MUCBookmarkManager.cpp
index aa8f026..3675635 100644
--- a/Swiften/MUC/MUCBookmarkManager.cpp
+++ b/Swiften/MUC/MUCBookmarkManager.cpp
@@ -28,15 +28,15 @@ void MUCBookmarkManager::handleBookmarksReceived(boost::shared_ptr<Storage> payl
storage = payload;
std::vector<MUCBookmark> receivedBookmarks;
- foreach (Storage::Conference conference, payload->getConferences()) {
- String name = (!conference.name.isEmpty()) ? conference.name : conference.jid.getNode();
- MUCBookmark bookmark(conference.jid, name);
- bookmark.setAutojoin(conference.autoJoin);
- if (!conference.nick.isEmpty()) {
- bookmark.setNick(conference.nick);
+ foreach (Storage::Room room, payload->getRooms()) {
+ String name = (!room.name.isEmpty()) ? room.name : room.jid.getNode();
+ MUCBookmark bookmark(room.jid, name);
+ bookmark.setAutojoin(room.autoJoin);
+ if (!room.nick.isEmpty()) {
+ bookmark.setNick(room.nick);
}
- if (!conference.password.isEmpty()) {
- bookmark.setPassword(conference.password);
+ if (!room.password.isEmpty()) {
+ bookmark.setPassword(room.password);
}
receivedBookmarks.push_back(bookmark);
}