libtransport.git Changeset - a32e962a1a97

Changeset - a32e962a1a97

Parent rev.

Child rev.

[Not reviewed]

0 3 0

HanzZ - 12 years ago 2013-02-11 20:44:28
hanzz.k@gmail.com

Libcommuni: Fixed bug when response to PM message initated from XMPP was not sent to the same JID

3 files changed with 24 insertions and 2 deletions:

backends/libcommuni/ircnetworkplugin.cpp

backends/libcommuni/session.cpp

backends/libcommuni/session.h

0 comments (0 inline, 0 general)

backends/libcommuni/ircnetworkplugin.cpp

➞

Show inline comments

+	}
 	std::string target = getTargetName(legacyName);
 	if (legacyName.find("/") != std::string::npos) {
 		m_sessions[session]->addPM(target, legacyName.substr(0, legacyName.find("@")));
+	}
 	LOG4CXX_INFO(logger, user << ": Session name: " << session << ", message to " << target);

backends/libcommuni/session.cpp

➞

Show inline comments

 	else {
 		std::string nickname = TO_UTF8(m->sender().name());
 		correctNickname(nickname);
 		LOG4CXX_INFO(logger, nickname + suffix);
 		np->handleMessage(user, nickname + suffix, TO_UTF8(msg));
 		if (m_pms.find(nickname) != m_pms.end()) {
 			if (hasIRCBuddy(m_pms[nickname], nickname)) {
 				LOG4CXX_INFO(logger, nickname);
 				np->handleMessage(user, m_pms[nickname] + suffix, TO_UTF8(msg), nickname, "", "", false, true);
 				return;
+			}
 			else {
 				nickname = nickname + suffix;
+			}
+		}
 		else {
 			nickname = nickname + suffix;
+		}
 		LOG4CXX_INFO(logger, nickname);
 		np->handleMessage(user, nickname, TO_UTF8(msg));
+	}
+}

backends/libcommuni/session.h

➞

Show inline comments

@@ @@ -81,6 +81,10 @@ public: @@
 		removeIRCBuddies(channel);
+	}
 	void addPM(const std::string &name, const std::string &room) {
 		m_pms[name] = room;
+	}
 	void setIdentify(const std::string &identify) {
 		m_identify = identify;
+	}
@@ @@ -133,6 +137,7 @@ protected: @@
 	bool m_connected;
 	std::list<std::string> m_rooms;
 	std::list<std::string> m_names;
 	std::map<std::string, std::string> m_pms;
 	IRCBuddyMap m_buddies;
 	QTimer *m_awayTimer;
 };

0 comments (0 inline, 0 general)