From 40cd350c6ecab5167fdfc2dc2260aa410946b7cf Mon Sep 17 00:00:00 2001
From: Catalin Badea <catalin.badea392@gmail.com>
Date: Mon, 30 Jul 2012 19:02:19 +0300
Subject: Fix displayed nicks.


diff --git a/Swift/Controllers/HistoryViewController.cpp b/Swift/Controllers/HistoryViewController.cpp
index 082be1b..57b331b 100644
--- a/Swift/Controllers/HistoryViewController.cpp
+++ b/Swift/Controllers/HistoryViewController.cpp
@@ -54,7 +54,6 @@ HistoryViewController::~HistoryViewController() {
 }
 
 void HistoryViewController::handleUIEvent(boost::shared_ptr<UIEvent> rawEvent) {
-	// TODO: add new nick manager
 	boost::shared_ptr<RequestHistoryUIEvent> event = boost::dynamic_pointer_cast<RequestHistoryUIEvent>(rawEvent);
 	if (event != NULL) {
 		if (historyWindow_ == NULL) {
@@ -143,7 +142,9 @@ void HistoryViewController::handleNewMessage(const HistoryMessage& message) {
 void HistoryViewController::addNewMessage(const HistoryMessage& message, bool addAtTheTop) {
 	bool senderIsSelf = message.getFromJID().toBare() == selfJID_;
 	std::string avatarPath = avatarManager_->getAvatarPath(message.getFromJID()).string();
-	historyWindow_->addMessage(message.getMessage(), nickResolver_->jidToNick(message.getFromJID()), senderIsSelf, avatarPath, message.getTime(), addAtTheTop);
+
+	std::string nick = message.getType() != HistoryMessage::Groupchat ? nickResolver_->jidToNick(message.getFromJID()) : message.getFromJID().getResource(); 
+	historyWindow_->addMessage(message.getMessage(), nick, senderIsSelf, avatarPath, message.getTime(), addAtTheTop);
 }
 
 void HistoryViewController::handleReturnPressed(const std::string& keyword) {
-- 
cgit v0.10.2-6-g49f6