diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 02:33:28 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 02:33:28 +0000 |
| commit | 657b6f877cc5422257555ecf96a99a8ab68e1e0e (patch) | |
| tree | 6d09487185a2e39009eb566f45cd4d8d99d9dfd3 /remoting | |
| parent | 6b37173d3faead2d1ec067710c12e9bf3493b4f4 (diff) | |
| download | chromium_src-657b6f877cc5422257555ecf96a99a8ab68e1e0e.zip chromium_src-657b6f877cc5422257555ecf96a99a8ab68e1e0e.tar.gz chromium_src-657b6f877cc5422257555ecf96a99a8ab68e1e0e.tar.bz2 | |
Roll libjingle to 98:99.
- Refactoring and bug fixes
- Remove global variables of class type.
NOTE: I'm landing this for Ronghua since he's on leave. The change has already been reviewed here: http://codereview.chromium.org/8790011/
but I had to create a new issue in order to resolve merge conflicts.
TBR=sergeyu
Review URL: http://codereview.chromium.org/8802019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/jingle_glue/xmpp_signal_strategy.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/jingle_glue/xmpp_signal_strategy.cc b/remoting/jingle_glue/xmpp_signal_strategy.cc index f85569f..26ea9ca 100644 --- a/remoting/jingle_glue/xmpp_signal_strategy.cc +++ b/remoting/jingle_glue/xmpp_signal_strategy.cc @@ -40,7 +40,7 @@ void XmppSignalStrategy::Init(StatusObserver* observer) { settings.set_user(login_jid.node()); settings.set_host(login_jid.domain()); settings.set_resource("chromoting"); - settings.set_use_tls(true); + settings.set_use_tls(buzz::TLS_ENABLED); settings.set_token_service(auth_token_service_); settings.set_auth_cookie(auth_token_); settings.set_server(talk_base::SocketAddress("talk.google.com", 5222)); |