diff options
| author | solb@chromium.org <solb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 14:40:40 +0000 |
|---|---|---|
| committer | solb@chromium.org <solb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 14:40:40 +0000 |
| commit | 4c3d809e72a64db376c11b578a6f699c8098f55e (patch) | |
| tree | 4efb8f9591ac64c57ae302ad4ea5722946e7c1a5 /remoting/protocol/jingle_messages.h | |
| parent | a66d40a66368cccadb999120078a66c066f92a8d (diff) | |
| download | chromium_src-4c3d809e72a64db376c11b578a6f699c8098f55e.zip chromium_src-4c3d809e72a64db376c11b578a6f699c8098f55e.tar.gz chromium_src-4c3d809e72a64db376c11b578a6f699c8098f55e.tar.bz2 | |
Remove XML FROM element in JingleSession::StartConnection
This element caused an assertion failure in libjingle at xmpp/xmppengineimpl.cc:367 when used from the client-side code.
Review URL: https://chromiumcodereview.appspot.com/16975019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_messages.h')
| -rw-r--r-- | remoting/protocol/jingle_messages.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/remoting/protocol/jingle_messages.h b/remoting/protocol/jingle_messages.h index 43dca4a..2b5feaa 100644 --- a/remoting/protocol/jingle_messages.h +++ b/remoting/protocol/jingle_messages.h @@ -71,6 +71,8 @@ struct JingleMessage { ActionType action; std::string sid; + std::string initiator; + scoped_ptr<ContentDescription> description; std::list<NamedCandidate> candidates; |