diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-03-22 23:08:34 +0800 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-03-22 23:08:34 +0800 |
| commit | d5ee1dea31080835f3c1ca091c58769fc989b037 (patch) | |
| tree | 6fe216c1e57f9b01e8b9ecb76b5cac4ad88216dc /src/empathy-account-assistant.c | |
| parent | af15e92f0ae08e321a46e21e92500bf47d060b44 (diff) | |
| download | gsoc2013-empathy-d5ee1dea31080835f3c1ca091c58769fc989b037.tar gsoc2013-empathy-d5ee1dea31080835f3c1ca091c58769fc989b037.tar.gz gsoc2013-empathy-d5ee1dea31080835f3c1ca091c58769fc989b037.tar.bz2 gsoc2013-empathy-d5ee1dea31080835f3c1ca091c58769fc989b037.tar.lz gsoc2013-empathy-d5ee1dea31080835f3c1ca091c58769fc989b037.tar.xz gsoc2013-empathy-d5ee1dea31080835f3c1ca091c58769fc989b037.tar.zst gsoc2013-empathy-d5ee1dea31080835f3c1ca091c58769fc989b037.zip | |
Only add the 'extra-certificate-identities' parameter if gabble supports it.
Diffstat (limited to 'src/empathy-account-assistant.c')
| -rw-r--r-- | src/empathy-account-assistant.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c index 4beda4b75..e84fa650c 100644 --- a/src/empathy-account-assistant.c +++ b/src/empathy-account-assistant.c @@ -422,7 +422,7 @@ account_assistant_protocol_changed_cb (GtkComboBox *chooser, "talkx.l.google.com:80", NULL}; - gchar *extra_identities[] = { + gchar *extra_certificate_identities[] = { "talk.google.com", NULL}; @@ -432,8 +432,12 @@ account_assistant_protocol_changed_cb (GtkComboBox *chooser, empathy_account_settings_set_strv (settings, "fallback-servers", fallback_servers); - empathy_account_settings_set_strv (settings, "extra-identities", - extra_identities); + if (empathy_account_settings_have_tp_param (settings, + "extra-certificate-identities")) + { + empathy_account_settings_set_strv (settings, + "extra-certificate-identities", extra_certificate_identities); + } } else if (is_facebook) { |