From eae5276f97e6ba3d8b93d4bff25043249cec6722 2011-09-21 22:01:21
From: HanzZ <hanzz.k@gmail.com>
Date: 2011-09-21 22:01:21
Subject: [PATCH] Send proper from in outgoing message for unknown user

---

diff --git a/spectrum/src/sample.cfg b/spectrum/src/sample.cfg
index 00e79b7d47c339093b25a3a43741d4f5f8a62d92..4fa7ed22fc9432be37d7e0affacd2f9fcf52b25b 100644
--- a/spectrum/src/sample.cfg
+++ b/spectrum/src/sample.cfg
@@ -11,8 +11,8 @@ admin_password=test
 #cert=server.pfx #patch to PKCS#12 certificate
 #cert_password=test #password to that certificate if any
 users_per_backend=10
-#backend=/home/hanzz/code/libtransport/backends/libpurple/spectrum_libpurple_backend
-backend=/home/hanzz/code/libtransport/backends/frotz/spectrum_frotz_backend
+backend=/home/hanzz/code/libtransport/backends/libpurple/spectrum_libpurple_backend
+#backend=/home/hanzz/code/libtransport/backends/frotz/spectrum_frotz_backend
 #backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
 #protocol=prpl-msn
 protocol=any
diff --git a/src/conversation.cpp b/src/conversation.cpp
index e80c552d48d6d66b7d6e2aecf555a89faa63a634..c4cc2e21146c35abc9aaf341244e7c797e86f957 100644
--- a/src/conversation.cpp
+++ b/src/conversation.cpp
@@ -59,7 +59,7 @@ void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, con
 				message->setFrom(buddy->getJID());
 			}
 			else {
-				message->setFrom(Swift::JID(Swift::JID::getEscapedNode(nickname), m_conversationManager->getComponent()->getJID().toBare()));
+				message->setFrom(Swift::JID(Swift::JID::getEscapedNode(m_legacyName), m_conversationManager->getComponent()->getJID().toBare()));
 			}
 		}
 		// PM message
diff --git a/src/tests/userregistry.cpp b/src/tests/userregistry.cpp
index 794f3e5468b727a6b4faddf15babfe31c54206be..9b5a7aa0b2d875cad9515ad7089803a888fe88e7 100644
--- a/src/tests/userregistry.cpp
+++ b/src/tests/userregistry.cpp
@@ -103,7 +103,7 @@ class UserRegistryTest : public CPPUNIT_NS :: TestFixture {
 		void handleDataReceived(const Swift::SafeByteArray &data, boost::shared_ptr<Swift::Connection> conn) {
 			if (conn == client1) {
 				received1.push_back(safeByteArrayToString(data));
-				std::cout << received1.back() << "\n";
+// 				std::cout << received1.back() << "\n";
 			}
 			else {
 				received2.push_back(safeByteArrayToString(data));