Only add the 'extra-certificate-identities' parameter if gabble supports it.

diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 9bbab1c8ed3fc3327594905810932147040b6b0a..b2e4314deae14465a2c8054dedbc7a1a545d741d 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -604,8 +604,12 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
       empathy_account_settings_set_strv (settings, "fallback-servers",
           fallback_servers);
 
-      empathy_account_settings_set_strv (settings,
-          "extra-certificate-identities", extra_certificate_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 (!tp_strdiff (service, "facebook"))
     {

diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 0db28d7a3a875e9f484ca5d58af1f0bd04fd0567..4005d279031cde9aa1ec41ebde6f3f886ec89281 100644 (file)
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -798,6 +798,13 @@ empathy_account_settings_get_tp_param (EmpathyAccountSettings *settings,
   return NULL;
 }
 
+gboolean
+empathy_account_settings_have_tp_param (EmpathyAccountSettings *settings,
+    const gchar *param)
+{
+  return (empathy_account_settings_get_tp_param (settings, param) != NULL);
+}
+
 static void
 account_settings_remove_from_unset (EmpathyAccountSettings *settings,
     const gchar *param)

diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index fb2b8f4c655642c2595e6bdf5f38744d677bf6ba..25f1d31557eab738cbaab3970e27bf4b0ffe0a05 100644 (file)
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -87,6 +87,10 @@ gboolean empathy_account_settings_has_account (
 TpConnectionManagerParam *empathy_account_settings_get_tp_params (
     EmpathyAccountSettings *settings);
 
+gboolean empathy_account_settings_have_tp_param (
+    EmpathyAccountSettings *settings,
+    const gchar *param);
+
 void empathy_account_settings_unset (EmpathyAccountSettings *settings,
     const gchar *param);