summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 19:36:31 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 19:36:31 +0000
commiteeeb25e6a364cd50fe3298486a45cdce5db558c3 (patch)
tree2ad454e49affbbd8cc783ce0f865b0ba57c58239 /jingle
parentb7ffc291223c4328b454bb934359336cda857a0e (diff)
downloadchromium_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
Diffstat (limited to 'jingle')
-rw-r--r--jingle/notifier/listener/mediator_thread_impl.cc4
1 files changed, 2 insertions, 2 deletions
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;