aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2011-06-28 16:11:45 +0800
committerWill Thompson <will.thompson@collabora.co.uk>2011-06-28 16:11:45 +0800
commita7757678bf287ad748b097f9362f52d248afc6ca (patch)
tree8dafa05f4f289a9426509ec1527c93dda7250d7f
parent5bba4ddbda12fa41f68889a737a7ceaa17496f34 (diff)
parent53a110fcf6a8b697f8d27a8c34b0cccf4db04b24 (diff)
downloadgsoc2013-empathy-a7757678bf287ad748b097f9362f52d248afc6ca.tar
gsoc2013-empathy-a7757678bf287ad748b097f9362f52d248afc6ca.tar.gz
gsoc2013-empathy-a7757678bf287ad748b097f9362f52d248afc6ca.tar.bz2
gsoc2013-empathy-a7757678bf287ad748b097f9362f52d248afc6ca.tar.lz
gsoc2013-empathy-a7757678bf287ad748b097f9362f52d248afc6ca.tar.xz
gsoc2013-empathy-a7757678bf287ad748b097f9362f52d248afc6ca.tar.zst
gsoc2013-empathy-a7757678bf287ad748b097f9362f52d248afc6ca.zip
Merge branch 'account-parameters'
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index b2e4314de..46188d499 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -600,7 +600,10 @@ 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_boolean (settings, "require-encryption",
+ TRUE);
empathy_account_settings_set_strv (settings, "fallback-servers",
fallback_servers);
@@ -615,7 +618,8 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
{
empathy_account_settings_set_icon_name_async (settings, "im-facebook",
NULL, NULL);
-
+ empathy_account_settings_set_boolean (settings, "require-encryption",
+ TRUE);
empathy_account_settings_set_string (settings, "server",
"chat.facebook.com");
}