summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-01 02:44:32 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-01 02:44:32 +0000
commit0116cf53e569e1c10db7febaf2ce027ce1e19d4a (patch)
tree6da1fcee56c6676e5ea2e39b78655f021eff70b8 /jingle
parent94f29e2e1d6758af5a6e726bde12394e3f9b8f28 (diff)
downloadchromium_src-0116cf53e569e1c10db7febaf2ce027ce1e19d4a.zip
chromium_src-0116cf53e569e1c10db7febaf2ce027ce1e19d4a.tar.gz
chromium_src-0116cf53e569e1c10db7febaf2ce027ce1e19d4a.tar.bz2
Roll libjingle 88:92
Beside other changes the new version of libjingle has thread-safe QName class and has all std::string and QName statics removed. BUG=94993,102451 TEST=Compiles Review URL: http://codereview.chromium.org/8413059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/notifier/base/gaia_token_pre_xmpp_auth.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
index 907ed5c..5e22667 100644
--- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
+++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
@@ -34,9 +34,9 @@ class GaiaCookieMechanism : public buzz::SaslCookieMechanism {
const std::string NS_GOOGLE_AUTH_PROTOCOL(
"http://www.google.com/talk/protocol/auth");
const buzz::QName QN_GOOGLE_ALLOW_GENERATED_JID_XMPP_LOGIN(
- true, NS_GOOGLE_AUTH_PROTOCOL, "allow-generated-jid");
+ NS_GOOGLE_AUTH_PROTOCOL, "allow-generated-jid");
const buzz::QName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT(
- true, NS_GOOGLE_AUTH_PROTOCOL, "client-uses-full-bind-result");
+ NS_GOOGLE_AUTH_PROTOCOL, "client-uses-full-bind-result");
auth->SetAttr(QN_GOOGLE_ALLOW_GENERATED_JID_XMPP_LOGIN, "true");
auth->SetAttr(QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT, "true");
return auth;