diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 05:49:31 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 05:49:31 +0000 |
| commit | 6c8beb5f61062a2926301d53f721dd81aa6dfda7 (patch) | |
| tree | 046a10a30db42cf75605bfd0bf9834fd1b1c5694 /chrome/browser/sync | |
| parent | e648166a931897dc068fb7b84725200e70911731 (diff) | |
| download | chromium_src-6c8beb5f61062a2926301d53f721dd81aa6dfda7.zip chromium_src-6c8beb5f61062a2926301d53f721dd81aa6dfda7.tar.gz chromium_src-6c8beb5f61062a2926301d53f721dd81aa6dfda7.tar.bz2 | |
Recombined buzz::PreXmppAuth and buzz::SaslHandler to be compatible
with upstream libjingle again.
Changed GaiaOnlySaslHandler to GaiaTokenPreXmppAuth to match
libjingle changes.
BUG=none
TEST=made sure sync worked with an @google.com account.
Review URL: http://codereview.chromium.org/2221004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/tools/sync_listen_notifications.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc index 91610f2..d57f466 100644 --- a/chrome/browser/sync/tools/sync_listen_notifications.cc +++ b/chrome/browser/sync/tools/sync_listen_notifications.cc @@ -92,7 +92,7 @@ class XmppNotificationClient : public sigslot::has_slots<> { // Transfers ownership of xmpp_socket_adapter. buzz::XmppReturnStatus connect_status = xmpp_client_->Connect(xmpp_client_settings_, "", - xmpp_socket_adapter, NULL, NULL); + xmpp_socket_adapter, NULL); CHECK_EQ(connect_status, buzz::XMPP_RETURN_OK); xmpp_client_->Start(); talk_base::Thread* current_thread = |