libtransport.git Changeset - eae5276f97e6

Changeset - eae5276f97e6

Parent rev.

Child rev.

[Not reviewed]

0 3 0

HanzZ - 14 years ago 2011-09-21 22:01:21
hanzz.k@gmail.com

Send proper from in outgoing message for unknown user

3 files changed with 4 insertions and 4 deletions:

spectrum/src/sample.cfg

src/conversation.cpp

src/tests/userregistry.cpp

0 comments (0 inline, 0 general)

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -8,14 +8,14 @@ backend_host=localhost # < this option doesn't work yet @@
 backend_port=10001
 admin_username=admin
 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
 #protocol=prpl-icq
 [backend]

src/conversation.cpp

➞

Show inline comments

 		if (nickname.empty()) {
 			Buddy *buddy = m_conversationManager->getUser()->getRosterManager()->getBuddy(m_legacyName);
 			if (buddy) {
 				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
 		else {
 			if (m_room.empty()) {
 				message->setFrom(Swift::JID(nickname, m_conversationManager->getComponent()->getJID().toBare(), "user"));

src/tests/userregistry.cpp

➞

Show inline comments

+		}
 		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));
 // 				std::cout << received2.back() << "\n";
+			}
+		}

0 comments (0 inline, 0 general)