Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-06-22 19:41:39 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-06-22 19:41:39 (GMT) |
| commit | 216cdc29eb9454f5eb772f3324ccf5210c48528a (patch) | |
| tree | 90c6ecdb4be71d232970e42eeccb83f4b3d8a8f5 /Swift/Controllers/ChatController.cpp | |
| parent | 9c9f97dc9ab10b644f59a9753c69b9691622025b (diff) | |
| download | swift-216cdc29eb9454f5eb772f3324ccf5210c48528a.zip swift-216cdc29eb9454f5eb772f3324ccf5210c48528a.tar.bz2 | |
Show own avatar in chat dialog.
Diffstat (limited to 'Swift/Controllers/ChatController.cpp')
| -rw-r--r-- | Swift/Controllers/ChatController.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Swift/Controllers/ChatController.cpp b/Swift/Controllers/ChatController.cpp index 5fee3d2..a8b8ab1 100644 --- a/Swift/Controllers/ChatController.cpp +++ b/Swift/Controllers/ChatController.cpp @@ -1,5 +1,6 @@ #include "Swift/Controllers/ChatController.h" +#include "Swiften/Avatars/AvatarManager.h" #include "Swift/Controllers/ChatWindow.h" #include "Swift/Controllers/ChatWindowFactory.h" #include "Swift/Controllers/NickResolver.h" @@ -9,8 +10,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, AvatarManager* avatarManager) - : ChatControllerBase(stanzaChannel, iqRouter, chatWindowFactory, contact, presenceOracle, avatarManager) { +ChatController::ChatController(const JID& self, StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, const JID &contact, NickResolver* nickResolver, PresenceOracle* presenceOracle, AvatarManager* avatarManager) + : ChatControllerBase(self, stanzaChannel, iqRouter, chatWindowFactory, contact, presenceOracle, avatarManager) { nickResolver_ = nickResolver; } @@ -28,7 +29,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(avatarManager_->getAvatarPath(selfJID_).string())); } String ChatController::senderDisplayNameFromMessage(const JID& from) { |