summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-03-29 18:54:23 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-03-29 18:54:23 (GMT)
commitd2b07202f6b71b0601d032dbf93778d0a656e808 (patch)
tree975f94343b6ece69406d30cafee449093ecfc768 /Swift/Controllers/Chat/ChatsManager.cpp
parentcf664dd8baa1accc355ec4a727899a9f68f68ed5 (diff)
downloadswift-d2b07202f6b71b0601d032dbf93778d0a656e808.zip
swift-d2b07202f6b71b0601d032dbf93778d0a656e808.tar.bz2
Populate the chats list with muc bookmarks
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.cpp')
-rw-r--r--Swift/Controllers/Chat/ChatsManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index d83c42e..8311726 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -50,7 +50,7 @@ ChatsManager::~ChatsManager() {
void ChatsManager::handleMUCBookmarkAdded(boost::shared_ptr<MUCBookmark> bookmark) {
std::map<JID, MUCController*>::iterator it = mucControllers_.find(bookmark->getRoom());
- if (it == mucControllers_.end()) {
+ if (it == mucControllers_.end() && bookmark->getAutojoin()) {
//FIXME: need vcard stuff here to get a nick
String nick = bookmark->getNick() ? bookmark->getNick().get() : "Swift user";
handleJoinMUCRequest(bookmark->getRoom(), nick);