diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 19:37:57 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 19:37:57 +0000 |
| commit | 16ce91fc01733f1056c514155b2110e1618ceb5c (patch) | |
| tree | 40491edc1d7efa7d59f391e20203e0ab64166ec6 | |
| parent | ddf1a607409691e9cadf367330619a665f240525 (diff) | |
| download | chromium_src-16ce91fc01733f1056c514155b2110e1618ceb5c.zip chromium_src-16ce91fc01733f1056c514155b2110e1618ceb5c.tar.gz chromium_src-16ce91fc01733f1056c514155b2110e1618ceb5c.tar.bz2 | |
Use xmpp.google.com instead of talk.google.com
Basically, xmpp.google.com is the new hostname for XMPP connections.
BUG=73067
TEST=
Review URL: http://codereview.chromium.org/6480089
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75161 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sync/tools/sync_listen_notifications.cc | 4 | ||||
| -rw-r--r-- | jingle/notifier/listener/mediator_thread_impl.cc | 4 | ||||
| -rw-r--r-- | remoting/jingle_glue/jingle_client.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc index 0eb9459..4a006fd 100644 --- a/chrome/browser/sync/tools/sync_listen_notifications.cc +++ b/chrome/browser/sync/tools/sync_listen_notifications.cc @@ -240,7 +240,7 @@ int main(int argc, char* argv[]) { std::string email = command_line.GetSwitchValueASCII("email"); if (email.empty()) { printf("Usage: %s --email=foo@bar.com [--password=mypassword] " - "[--server=talk.google.com] [--port=5222] [--allow-plain] " + "[--server=xmpp.google.com] [--port=5222] [--allow-plain] " "[--disable-tls] [--use-ssl-tcp] [--server-notifier-state] " "[--use-legacy-notifier] " "[--legacy-notifier-send-initial-update]\n", @@ -250,7 +250,7 @@ int main(int argc, char* argv[]) { std::string password = command_line.GetSwitchValueASCII("password"); std::string server = command_line.GetSwitchValueASCII("server"); if (server.empty()) { - server = "talk.google.com"; + server = "xmpp.google.com"; } std::string port_str = command_line.GetSwitchValueASCII("port"); int port = 5222; diff --git a/jingle/notifier/listener/mediator_thread_impl.cc b/jingle/notifier/listener/mediator_thread_impl.cc index 032c08e..667ed13 100644 --- a/jingle/notifier/listener/mediator_thread_impl.cc +++ b/jingle/notifier/listener/mediator_thread_impl.cc @@ -137,10 +137,10 @@ void MediatorThreadImpl::DoLogin( server_list_count = 1; } else { // The default servers know how to serve over port 443 (that's the magic). - server_list[0].server = net::HostPortPair("talk.google.com", + server_list[0].server = net::HostPortPair("xmpp.google.com", notifier::kDefaultXmppPort); server_list[0].special_port_magic = true; - server_list[1].server = net::HostPortPair("talkx.l.google.com", + server_list[1].server = net::HostPortPair("xmppx.l.google.com", notifier::kDefaultXmppPort); server_list[1].special_port_magic = true; server_list_count = 2; diff --git a/remoting/jingle_glue/jingle_client.cc b/remoting/jingle_glue/jingle_client.cc index 7b00d79..11be9fb 100644 --- a/remoting/jingle_glue/jingle_client.cc +++ b/remoting/jingle_glue/jingle_client.cc @@ -69,7 +69,7 @@ void JingleClient::DoInitialize(const std::string& username, settings.set_use_tls(true); settings.set_token_service(auth_token_service); settings.set_auth_cookie(auth_token); - settings.set_server(talk_base::SocketAddress("talk.google.com", 5222)); + settings.set_server(talk_base::SocketAddress("xmpp.google.com", 5222)); client_ = new buzz::XmppClient(thread_->task_pump()); client_->SignalStateChange.connect( |