aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-protocol-chooser.c
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-03-18 21:38:10 +0800
committerStef Walter <stefw@collabora.co.uk>2011-03-22 22:27:23 +0800
commit6cd0e1c0916e69eb15192c6bdbf1b5d7ee599f5a (patch)
tree911f1d30867b53416aeb7dc012186006a409ee03 /libempathy-gtk/empathy-protocol-chooser.c
parent6c5affb1f943b6685a0ac63adcfff24b47be6e2e (diff)
downloadgsoc2013-empathy-6cd0e1c0916e69eb15192c6bdbf1b5d7ee599f5a.tar
gsoc2013-empathy-6cd0e1c0916e69eb15192c6bdbf1b5d7ee599f5a.tar.gz
gsoc2013-empathy-6cd0e1c0916e69eb15192c6bdbf1b5d7ee599f5a.tar.bz2
gsoc2013-empathy-6cd0e1c0916e69eb15192c6bdbf1b5d7ee599f5a.tar.lz
gsoc2013-empathy-6cd0e1c0916e69eb15192c6bdbf1b5d7ee599f5a.tar.xz
gsoc2013-empathy-6cd0e1c0916e69eb15192c6bdbf1b5d7ee599f5a.tar.zst
gsoc2013-empathy-6cd0e1c0916e69eb15192c6bdbf1b5d7ee599f5a.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
Diffstat (limited to 'libempathy-gtk/empathy-protocol-chooser.c')
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 6e6b8bb79..9bbab1c8e 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -594,11 +594,18 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
"talkx.l.google.com:80",
NULL};
+ gchar *extra_certificate_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-certificate-identities", extra_certificate_identities);
}
else if (!tp_strdiff (service, "facebook"))
{