Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

Unified Diff: remoting/protocol/jingle_messages.cc

Issue 16975019: Remove XML FROM element in JingleSession::StartConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reinvented fix to repair broken unit tests Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/jingle_messages.h ('k') | remoting/protocol/jingle_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_messages.cc
diff --git a/remoting/protocol/jingle_messages.cc b/remoting/protocol/jingle_messages.cc
index 9fd87575dfbd371be6ae44a4dfe3693a11e4095a..2a5b2f0edc30dd79bb33e40d9e2537c5ed0c2de5 100644
--- a/remoting/protocol/jingle_messages.cc
+++ b/remoting/protocol/jingle_messages.cc
@@ -168,6 +168,7 @@ bool JingleMessage::ParseXml(const buzz::XmlElement* stanza,
from = stanza->Attr(QName(kEmptyNamespace, "from"));
to = stanza->Attr(QName(kEmptyNamespace, "to"));
+ initiator = jingle_tag->Attr(QName(kEmptyNamespace, "initiator"));
std::string action_str = jingle_tag->Attr(QName(kEmptyNamespace, "action"));
if (action_str.empty()) {
@@ -287,7 +288,7 @@ scoped_ptr<buzz::XmlElement> JingleMessage::ToXml() const {
}
if (action == SESSION_INITIATE)
- jingle_tag->AddAttr(QName(kEmptyNamespace, "initiator"), from);
+ jingle_tag->AddAttr(QName(kEmptyNamespace, "initiator"), initiator);
if (reason != UNKNOWN_REASON) {
XmlElement* reason_tag = new XmlElement(QName(kJingleNamespace, "reason"));
« no previous file with comments | « remoting/protocol/jingle_messages.h ('k') | remoting/protocol/jingle_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698