[empathy] set the server field of Google Talk account

[Guillaume Desmottes <gdesmott src gnome org>]

commit f79f134280bb47d7fd10b958ccf60ca10bd40757
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Mar 4 18:38:24 2010 +0100

    set the server field of Google Talk account
    
    This should solve connection issue with buggy router (#601089).

 src/empathy-account-assistant.c |   16 ++++++++++++----
 src/empathy-accounts-dialog.c   |   16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 089b11f..e5c5e80 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -416,11 +416,19 @@ account_assistant_protocol_changed_cb (GtkComboBox *chooser,
   settings = empathy_account_settings_new (cm->name, proto->name, str);
 
   if (is_gtalk)
-    empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
-      NULL, NULL);
+    {
+      empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
+        NULL, NULL);
+      /* We should not have to set the server but that may cause issue with
+       * buggy router. */
+      empathy_account_settings_set_string (settings, "server",
+          "talk.google.com");
+    }
   else if (is_facebook)
-    empathy_account_settings_set_icon_name_async (settings, "im-facebook",
-      NULL, NULL);
+    {
+      empathy_account_settings_set_icon_name_async (settings, "im-facebook",
+        NULL, NULL);
+    }
 
   if (priv->first_resp == RESPONSE_CREATE_ACCOUNT)
     empathy_account_settings_set_boolean (settings, "register", TRUE);
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 6999d59..5162e0b 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -583,11 +583,19 @@ accounts_dialog_setup_ui_to_add_account (EmpathyAccountsDialog *dialog)
   g_free (str);
 
   if (is_gtalk)
-    empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
-        NULL, NULL);
+    {
+      empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
+          NULL, NULL);
+      /* We should not have to set the server but that may cause issue with
+       * buggy router. */
+      empathy_account_settings_set_string (settings, "server",
+          "talk.google.com");
+    }
   else if (is_facebook)
-    empathy_account_settings_set_icon_name_async (settings, "im-facebook",
-        NULL, NULL);
+    {
+      empathy_account_settings_set_icon_name_async (settings, "im-facebook",
+          NULL, NULL);
+    }
 
   accounts_dialog_add (dialog, settings);
   accounts_dialog_model_set_selected (dialog, settings);