summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 21:47:30 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-30 21:47:30 +0000
commit285489264a7ba7e24db20c3878589cb0847c0d5d (patch)
treefb582d45c1ff9c3667718dc6e94ad3a0d3ae5a62 /remoting
parentfa6d2a2fef45fce6247c3ca8f33724e95a2c96b7 (diff)
downloadchromium_src-285489264a7ba7e24db20c3878589cb0847c0d5d.zip
chromium_src-285489264a7ba7e24db20c3878589cb0847c0d5d.tar.gz
chromium_src-285489264a7ba7e24db20c3878589cb0847c0d5d.tar.bz2
Properly parse multiple channel configs.
BUG=None TEST=None Review URL: http://codereview.chromium.org/5319009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/protocol/jingle_session_manager.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index 46367c9..12f9298 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -365,7 +365,7 @@ bool JingleSessionManager::ParseContent(
if (!ParseChannelConfig(child, false, &channel_config))
return false;
config->mutable_control_configs()->push_back(channel_config);
- child = element->NextNamed(control_tag);
+ child = child->NextNamed(control_tag);
}
// <event> tags.
@@ -376,7 +376,7 @@ bool JingleSessionManager::ParseContent(
if (!ParseChannelConfig(child, false, &channel_config))
return false;
config->mutable_event_configs()->push_back(channel_config);
- child = element->NextNamed(event_tag);
+ child = child->NextNamed(event_tag);
}
// <video> tags.
@@ -387,7 +387,7 @@ bool JingleSessionManager::ParseContent(
if (!ParseChannelConfig(child, true, &channel_config))
return false;
config->mutable_video_configs()->push_back(channel_config);
- child = element->NextNamed(video_tag);
+ child = child->NextNamed(video_tag);
}
// <initial-resolution> tag.