Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-06-22 17:38:29 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-06-22 17:39:06 (GMT) |
| commit | e8360f0dd62ea651e94f681499faef58747f2ece (patch) | |
| tree | 5eeb231a12a44c65baf648b0350387a6f25986af /Swift/Controllers/ChatControllerBase.cpp | |
| parent | 86e892137d512a11edde0aa7760fc1c15e598dad (diff) | |
| download | swift-e8360f0dd62ea651e94f681499faef58747f2ece.zip swift-e8360f0dd62ea651e94f681499faef58747f2ece.tar.bz2 | |
Support vCard-based avatars in MUCs.
Diffstat (limited to 'Swift/Controllers/ChatControllerBase.cpp')
| -rw-r--r-- | Swift/Controllers/ChatControllerBase.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Swift/Controllers/ChatControllerBase.cpp b/Swift/Controllers/ChatControllerBase.cpp index e84ee04..91d088e 100644 --- a/Swift/Controllers/ChatControllerBase.cpp +++ b/Swift/Controllers/ChatControllerBase.cpp @@ -3,12 +3,12 @@ #include <boost/bind.hpp> #include <boost/shared_ptr.hpp> -#include "Swiften/Avatars/AvatarManager.h" #include "Swiften/Client/StanzaChannel.h" #include "Swiften/Base/foreach.h" #include "Swift/Controllers/ChatWindow.h" #include "Swift/Controllers/ChatWindowFactory.h" #include "Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h" +#include "Swiften/Avatars/AvatarManager.h" namespace Swift { @@ -109,11 +109,6 @@ void ChatControllerBase::showChatWindow() { chatWindow_->show(); } -String ChatControllerBase::senderDisplayNameFromMessage(JID from) { - return from; -} - - void ChatControllerBase::handleIncomingMessage(boost::shared_ptr<MessageEvent> messageEvent) { unreadMessages_.push_back(messageEvent); |