aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-03-19 01:47:09 +0800
committerStef Walter <stefw@collabora.co.uk>2011-03-22 23:02:13 +0800
commitaf15e92f0ae08e321a46e21e92500bf47d060b44 (patch)
treee89533a1148c1f55ea4d12f832794210e4591a64
parent48c53fdb5bfcf801fc3f8eadf11340b97cae003b (diff)
downloadgsoc2013-empathy-af15e92f0ae08e321a46e21e92500bf47d060b44.tar
gsoc2013-empathy-af15e92f0ae08e321a46e21e92500bf47d060b44.tar.gz
gsoc2013-empathy-af15e92f0ae08e321a46e21e92500bf47d060b44.tar.bz2
gsoc2013-empathy-af15e92f0ae08e321a46e21e92500bf47d060b44.tar.lz
gsoc2013-empathy-af15e92f0ae08e321a46e21e92500bf47d060b44.tar.xz
gsoc2013-empathy-af15e92f0ae08e321a46e21e92500bf47d060b44.tar.zst
gsoc2013-empathy-af15e92f0ae08e321a46e21e92500bf47d060b44.zip
Create GTalk accounts with extra-certificate-identities = 'talk.google.com'
When creating google talk accounts, allow 'talk.google.com' as an extra identity for server certificate validation. https://bugzilla.gnome.org/show_bug.cgi?id=645133
-rw-r--r--src/empathy-account-assistant.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 4e6327231..4beda4b75 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -422,11 +422,18 @@ account_assistant_protocol_changed_cb (GtkComboBox *chooser,
"talkx.l.google.com:80",
NULL};
+ gchar *extra_identities[] = {
+ "talk.google.com",
+ NULL};
+
empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
NULL, NULL);
empathy_account_settings_set_strv (settings, "fallback-servers",
fallback_servers);
+
+ empathy_account_settings_set_strv (settings, "extra-identities",
+ extra_identities);
}
else if (is_facebook)
{