diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-17 19:36:31 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-17 19:36:31 +0000 |
| commit | eeeb25e6a364cd50fe3298486a45cdce5db558c3 (patch) | |
| tree | 2ad454e49affbbd8cc783ce0f865b0ba57c58239 | |
| parent | b7ffc291223c4328b454bb934359336cda857a0e (diff) | |
| download | chromium_src-eeeb25e6a364cd50fe3298486a45cdce5db558c3.zip chromium_src-eeeb25e6a364cd50fe3298486a45cdce5db558c3.tar.gz chromium_src-eeeb25e6a364cd50fe3298486a45cdce5db558c3.tar.bz2 | |
Revert 75262: "Use xmpp.google.com instead of talk.google.com"
75262 breaks sync for non-@gmail.com accounts. Will revert until that
is sorted out.
BUG=73067
TBR=hclam
Review URL: http://codereview.chromium.org/6519058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75296 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 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc index 4a006fd..0eb9459 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=xmpp.google.com] [--port=5222] [--allow-plain] " + "[--server=talk.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 = "xmpp.google.com"; + server = "talk.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 667ed13..032c08e 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("xmpp.google.com", + server_list[0].server = net::HostPortPair("talk.google.com", notifier::kDefaultXmppPort); server_list[0].special_port_magic = true; - server_list[1].server = net::HostPortPair("xmppx.l.google.com", + server_list[1].server = net::HostPortPair("talkx.l.google.com", notifier::kDefaultXmppPort); server_list[1].special_port_magic = true; server_list_count = 2; |