Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-10-03 16:31:16 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-10-03 16:31:16 (GMT) |
| commit | a487e087022105ae82a1e30abf70bfcc4e6b8281 (patch) | |
| tree | e92a1b87546efdb78e046d85d25f79e91fc67c3b /Swift/Controllers/Chat | |
| parent | d9a1a47e107bba107499db0fc970ac774fac79e9 (diff) | |
| download | swift-a487e087022105ae82a1e30abf70bfcc4e6b8281.zip swift-a487e087022105ae82a1e30abf70bfcc4e6b8281.tar.bz2 | |
Don't treat role changes as a mergeable status change
Diffstat (limited to 'Swift/Controllers/Chat')
| -rw-r--r-- | Swift/Controllers/Chat/MUCController.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp index 3b799d9..064c87e 100644 --- a/Swift/Controllers/Chat/MUCController.cpp +++ b/Swift/Controllers/Chat/MUCController.cpp @@ -247,6 +247,7 @@ void MUCController::preHandleIncomingMessage(boost::shared_ptr<MessageEvent> mes } void MUCController::handleOccupantRoleChanged(const String& nick, const MUCOccupant& occupant, const MUCOccupant::Role& oldRole) { + clearPresenceQueue(); receivedActivity(); JID jid(nickToJID(nick)); roster_->removeContactFromGroup(jid, roleToGroupName(oldRole)); |