1 files changed, 14 insertions, 11 deletions

diff --git a/tp-account-widgets/tpaw-account-settings.c b/tp-account-widgets/tpaw-account-settings.c
index e0d2a128..4c1fdc42 100644
--- a/tp-account-widgets/tpaw-account-settings.c
+++ b/tp-account-widgets/tpaw-account-settings.c
@@ -499,7 +499,7 @@ tpaw_account_settings_check_readyness (TpawAccountSettings *self)
   if (self->priv->protocol_obj == NULL)
     {
       self->priv->protocol_obj = g_object_ref (
-          tp_connection_manager_get_protocol_object (self->priv->manager,
+          tp_connection_manager_get_protocol (self->priv->manager,
             self->priv->protocol));
     }
 
@@ -516,7 +516,7 @@ tpaw_account_settings_check_readyness (TpawAccountSettings *self)
     {
       if (tp_strv_contains (tp_protocol_get_authentication_types (
                   self->priv->protocol_obj),
-              TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION))
+              TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1))
         {
           self->priv->supports_sasl = TRUE;
         }
@@ -772,8 +772,7 @@ tpaw_account_settings_dup (TpawAccountSettings *settings,
     {
       GVariant *parameters;
 
-      parameters = tp_account_dup_parameters_vardict (
-          settings->priv->account);
+      parameters = tp_account_dup_parameters (settings->priv->account);
       result = g_variant_lookup_value (parameters, param, NULL);
       g_variant_unref (parameters);
 
@@ -1277,7 +1276,7 @@ tpaw_account_settings_account_updated (GObject *source,
   GError *error = NULL;
   GStrv reconnect_required = NULL;
 
-  if (!tp_account_update_parameters_vardict_finish (TP_ACCOUNT (source),
+  if (!tp_account_update_parameters_finish (TP_ACCOUNT (source),
           result, &reconnect_required, &error))
     {
       g_simple_async_result_set_from_error (settings->priv->apply_result,
@@ -1462,7 +1461,7 @@ tpaw_account_settings_apply_async (TpawAccountSettings *settings,
     }
   else
     {
-      tp_account_update_parameters_vardict_async (settings->priv->account,
+      tp_account_update_parameters_async (settings->priv->account,
           build_parameters_variant (settings),
           (const gchar **) settings->priv->unset_parameters->data,
           tpaw_account_settings_account_updated, settings);
@@ -1549,12 +1548,16 @@ tpaw_account_settings_parameter_is_valid (
       if (settings->priv->account != NULL &&
           !tpaw_account_settings_is_unset (settings, param))
         {
-          const GHashTable *account_params;
+          GVariant *account_params;
 
-          account_params = tp_account_get_parameters (
-              settings->priv->account);
-          if (tp_asv_lookup (account_params, param))
-            goto test_regex;
+          account_params = tp_account_dup_parameters (settings->priv->account);
+
+          if (tp_vardict_has_key (account_params, param))
+            {
+              g_variant_unref (account_params);
+              goto test_regex;
+            }
+          g_variant_unref (account_params);
         }
 
       return FALSE;