libtransport.git Changeset - 3daa3810774b

Changeset - 3daa3810774b

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 14 years ago 2011-09-11 18:00:25
hanzz.k@gmail.com

Send proper from when buddy is not in roster

1 file changed with 5 insertions and 1 deletions:

src/conversation.cpp

0 comments (0 inline, 0 general)

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 {
 				// TODO: escape from and setFrom
 				std::string name = nickname;
 				if (name.find_last_of("@") != std::string::npos) {
 					name.replace(name.find_last_of("@"), 1, "%");
+				}
 				message->setFrom(name);
+			}
+		}
 		// PM message
 		else {
 			if (m_room.empty()) {
 				message->setFrom(Swift::JID(nickname, m_conversationManager->getComponent()->getJID().toBare(), "user"));

0 comments (0 inline, 0 general)