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 /jingle | |
| 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 'jingle')
| -rw-r--r-- | jingle/glue/fake_network_manager.cc | 2 | ||||
| -rw-r--r-- | jingle/notifier/base/notifier_options_util.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jingle/glue/fake_network_manager.cc b/jingle/glue/fake_network_manager.cc index d30aba9..e591cea 100644 --- a/jingle/glue/fake_network_manager.cc +++ b/jingle/glue/fake_network_manager.cc @@ -20,7 +20,7 @@ FakeNetworkManager::FakeNetworkManager(const net::IPAddressNumber& address) talk_base::SocketAddress socket_address; CHECK(IPEndPointToSocketAddress(endpoint, &socket_address)); network_.reset(new talk_base::Network("fake", "Fake Network", - socket_address.ip(), 0)); + socket_address.ip())); } FakeNetworkManager::~FakeNetworkManager() { diff --git a/jingle/notifier/base/notifier_options_util.cc b/jingle/notifier/base/notifier_options_util.cc index 24fdad0..e4b1752 100644 --- a/jingle/notifier/base/notifier_options_util.cc +++ b/jingle/notifier/base/notifier_options_util.cc @@ -23,14 +23,14 @@ buzz::XmppClientSettings MakeXmppClientSettings( xmpp_client_settings.set_user(jid.node()); xmpp_client_settings.set_resource("chrome-sync"); xmpp_client_settings.set_host(jid.domain()); - xmpp_client_settings.set_use_tls(true); + xmpp_client_settings.set_use_tls(buzz::TLS_ENABLED); xmpp_client_settings.set_auth_cookie( notifier_options.invalidate_xmpp_login ? token + "bogus" : token); xmpp_client_settings.set_token_service(token_service); if (notifier_options.allow_insecure_connection) { xmpp_client_settings.set_allow_plain(true); - xmpp_client_settings.set_use_tls(false); + xmpp_client_settings.set_use_tls(buzz::TLS_DISABLED); } return xmpp_client_settings; } |