summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 18:25:50 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 18:25:50 +0000
commit4040f13c129fbd741aa7d19fcba5ef2ce5fd41fb (patch)
tree80bfd532259b47fe348ce332fc9980695312f7cb /remoting
parent2f7830b3614009f44e88fb2275e368d5496be10a (diff)
downloadchromium_src-4040f13c129fbd741aa7d19fcba5ef2ce5fd41fb.zip
chromium_src-4040f13c129fbd741aa7d19fcba5ef2ce5fd41fb.tar.gz
chromium_src-4040f13c129fbd741aa7d19fcba5ef2ce5fd41fb.tar.bz2
IqRequest implementations: calls the callback when response is received.
BUG=None TEST=Chromoting host works. Review URL: http://codereview.chromium.org/7744058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/jingle_glue/javascript_iq_request.cc2
-rw-r--r--remoting/jingle_glue/xmpp_iq_request.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/remoting/jingle_glue/javascript_iq_request.cc b/remoting/jingle_glue/javascript_iq_request.cc
index 0b75c71..b08ffe9 100644
--- a/remoting/jingle_glue/javascript_iq_request.cc
+++ b/remoting/jingle_glue/javascript_iq_request.cc
@@ -57,7 +57,7 @@ void JavascriptIqRegistry::OnIncomingStanza(const buzz::XmlElement* stanza) {
// JavascriptIqRequest::SendIq(), but remove in
// JavascriptIqRegistry::OnIq(). We should try to keep the
// registration/deregistration in one spot.
- if (it->second->callback_.is_null()) {
+ if (!it->second->callback_.is_null()) {
it->second->callback_.Run(stanza);
it->second->callback_.Reset();
} else {
diff --git a/remoting/jingle_glue/xmpp_iq_request.cc b/remoting/jingle_glue/xmpp_iq_request.cc
index e48120bc..b8057c3 100644
--- a/remoting/jingle_glue/xmpp_iq_request.cc
+++ b/remoting/jingle_glue/xmpp_iq_request.cc
@@ -57,7 +57,7 @@ void XmppIqRequest::Unregister() {
void XmppIqRequest::IqResponse(buzz::XmppIqCookie cookie,
const buzz::XmlElement* stanza) {
- if (callback_.is_null()) {
+ if (!callback_.is_null()) {
callback_.Run(stanza);
callback_.Reset();
}