Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-12-05 13:40:48 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-12-05 13:42:56 (GMT) |
| commit | ec923326d40708e2ef639bf191126ecb197c4c30 (patch) | |
| tree | d4093c8f75504958a429d611695fdb9a9d61a5b2 /Swiften | |
| parent | 6ba6af2934095f54f51d17c1d9ed8216b6249aa3 (diff) | |
| download | swift-contrib-ec923326d40708e2ef639bf191126ecb197c4c30.zip swift-contrib-ec923326d40708e2ef639bf191126ecb197c4c30.tar.bz2 | |
Don't mess up avatars after a MUC reconnect.
Resolves: #702
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/MUC/MUC.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/MUC/MUC.cpp b/Swiften/MUC/MUC.cpp index 4185fa8..dd57698 100644 --- a/Swiften/MUC/MUC.cpp +++ b/Swiften/MUC/MUC.cpp @@ -25,7 +25,6 @@ typedef std::pair<String, MUCOccupant> StringMUCOccupantPair; MUC::MUC(StanzaChannel* stanzaChannel, IQRouter* iqRouter, DirectedPresenceSender* presenceSender, const JID &muc, MUCRegistry* mucRegistry) : ownMUCJID(muc), stanzaChannel(stanzaChannel), iqRouter_(iqRouter), presenceSender(presenceSender), mucRegistry(mucRegistry) { scopedConnection_ = stanzaChannel->onPresenceReceived.connect(boost::bind(&MUC::handleIncomingPresence, this, _1)); - mucRegistry->addMUC(getJID()); } //FIXME: discover reserved nickname @@ -41,6 +40,7 @@ void MUC::joinAs(const String &nick) { void MUC::internalJoin(const String &nick) { //TODO: password //TODO: history request + mucRegistry->addMUC(getJID()); joinComplete_ = false; ownMUCJID = JID(ownMUCJID.getNode(), ownMUCJID.getDomain(), nick); boost::shared_ptr<Presence> joinPresence(presenceSender->getLastSentUndirectedPresence()); |