From ee93f90f636e2f646880489f2aeea2f61c508268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20Badea?= <catalin.badea392@gmail.com>
Date: Sat, 11 Aug 2012 23:11:36 +0300
Subject: Fix displaying room contacts' nicks.


diff --git a/Swift/Controllers/HistoryViewController.cpp b/Swift/Controllers/HistoryViewController.cpp
index de63e74..21eb9eb 100644
--- a/Swift/Controllers/HistoryViewController.cpp
+++ b/Swift/Controllers/HistoryViewController.cpp
@@ -170,7 +170,14 @@ void HistoryViewController::handleReturnPressed(const std::string& keyword) {
 
 		for (ContactsMap::const_iterator contact = contacts_[type].begin(); contact != contacts_[type].end(); contact++) {
 			const JID& jid = contact->first;
-			roster_->addContact(jid, jid, nickResolver_->jidToNick(jid), category[type], avatarManager_->getAvatarPath(jid).string());
+			std::string nick;
+			if (type == HistoryMessage::PrivateMessage) {
+				nick = jid.toString();
+			}
+			else {
+				nick = nickResolver_->jidToNick(jid);
+			}
+			roster_->addContact(jid, jid, nick, category[type], avatarManager_->getAvatarPath(jid).string());
 
 			Presence::ref presence = presenceOracle_->getHighestPriorityPresence(jid);
 
-- 
cgit v0.10.2-6-g49f6