Set 'server' parameter on GTalk accounts.

This stops us depending on properly-configured SRV records.
'fallback-servers' is not good enough in this situation:

 • foo.com's XMPP stuff is served by Google Apps;
 • your router breaks SRV requests;
 • foo.com resolves to 1.2.3.4 which has a (different) XMPP server
   listening on port 5222.

This may seem far-fetched, but this happened to two completely different
people, both hosted with Dreamhost.

https://bugzilla.gnome.org/show_bug.cgi?id=653510

diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index b2e4314deae14465a2c8054dedbc7a1a545d741d..6a97de64cf8d766ae6bf1e5863ddef41ea7226f9 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -600,7 +600,8 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
 
       empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
           NULL, NULL);
-
+      empathy_account_settings_set_string (settings, "server",
+          extra_certificate_identities[0]);
       empathy_account_settings_set_strv (settings, "fallback-servers",
           fallback_servers);