Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-06-20 11:47:21 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-06-20 14:38:58 (GMT) |
| commit | 6eb30e0e1f0a8e7ee936f3c006c7f710785653df (patch) | |
| tree | 1e72dd6445d7d8d4e06f71c52299260a941a5be6 /Swift/Controllers/ChatController.cpp | |
| parent | 6d50c38e2bc6a17afb19effe06d2103f06c8ea1c (diff) | |
| download | swift-6eb30e0e1f0a8e7ee936f3c006c7f710785653df.zip swift-6eb30e0e1f0a8e7ee936f3c006c7f710785653df.tar.bz2 | |
Added vCard-based avatars support.
Diffstat (limited to 'Swift/Controllers/ChatController.cpp')
| -rw-r--r-- | Swift/Controllers/ChatController.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/Controllers/ChatController.cpp b/Swift/Controllers/ChatController.cpp index 8c0b8bb..39e9144 100644 --- a/Swift/Controllers/ChatController.cpp +++ b/Swift/Controllers/ChatController.cpp @@ -9,8 +9,8 @@ namespace Swift { /** * The controller does not gain ownership of the stanzaChannel, nor the factory. */ -ChatController::ChatController(StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, const JID &contact, NickResolver* nickResolver, PresenceOracle* presenceOracle) - : ChatControllerBase(stanzaChannel, iqRouter, chatWindowFactory, contact, presenceOracle) { +ChatController::ChatController(StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, const JID &contact, NickResolver* nickResolver, PresenceOracle* presenceOracle, AvatarManager* avatarManager) + : ChatControllerBase(stanzaChannel, iqRouter, chatWindowFactory, contact, presenceOracle, avatarManager) { nickResolver_ = nickResolver; } @@ -28,7 +28,7 @@ void ChatController::preHandleIncomingMessage(boost::shared_ptr<Message> message } void ChatController::postSendMessage(const String& body) { - chatWindow_->addMessage(body, "me", true, labelsEnabled_ ? chatWindow_->getSelectedSecurityLabel() : boost::optional<SecurityLabel>()); + chatWindow_->addMessage(body, "me", true, labelsEnabled_ ? chatWindow_->getSelectedSecurityLabel() : boost::optional<SecurityLabel>(), ""); } String ChatController::senderDisplayNameFromMessage(JID from) { |