diff options
author | Kevin Smith <git@kismith.co.uk> | 2010-05-26 18:30:52 (GMT) |
---|---|---|
committer | Kevin Smith <git@kismith.co.uk> | 2010-05-26 18:30:52 (GMT) |
commit | 103e5d04240fa6c9decf54802bca083c2cd65744 (patch) | |
tree | b7549d9109099407ae0c64a3f37218cd5838a31b /Swift/Controllers | |
parent | e497af7cd28d2cf58d81ed8fd351b5d5ccfa56a4 (diff) | |
download | swift-103e5d04240fa6c9decf54802bca083c2cd65744.zip swift-103e5d04240fa6c9decf54802bca083c2cd65744.tar.bz2 |
Do JID Map lookups for MUC rosters.
In the same way as was already done for user rosters.
Resolves: #395
Diffstat (limited to 'Swift/Controllers')
-rw-r--r-- | Swift/Controllers/Chat/MUCController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp index dbf03c9..e582f1b 100644 --- a/Swift/Controllers/Chat/MUCController.cpp +++ b/Swift/Controllers/Chat/MUCController.cpp @@ -48,7 +48,7 @@ MUCController::MUCController ( parting_ = false; events_ = uiEventStream; - roster_ = new Roster(); + roster_ = new Roster(true); chatWindow_->setRosterModel(roster_); chatWindow_->onClosed.connect(boost::bind(&MUCController::handleWindowClosed, this)); muc_->onJoinComplete.connect(boost::bind(&MUCController::handleJoinComplete, this, _1)); @@ -125,7 +125,7 @@ void MUCController::handleJoinComplete(const String& nick) { } void MUCController::handleAvatarChanged(const JID& jid, const String&) { - if (parting_) { + if (parting_ || !jid.equals(toJID_, JID::WithoutResource)) { return; } String path = avatarManager_->getAvatarPath(jid).string(); |