summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-25 18:04:23 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-25 18:04:23 +0000
commitdfe8d99243fc390f55662ece0d40382baa9d70f1 (patch)
tree29f473498ff81cad8d4732220527e41c0ab58151
parenta602693a92e84e984caf92f6fad8d61789499798 (diff)
tpaw_account_settings_parameter_is_valid: use tp_vardict_has_keynext-untested
Based on a patch by Guillaume Desmottes.
-rw-r--r--tp-account-widgets/tpaw-account-settings.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/tp-account-widgets/tpaw-account-settings.c b/tp-account-widgets/tpaw-account-settings.c
index 2f5077a0..4c1fdc42 100644
--- a/tp-account-widgets/tpaw-account-settings.c
+++ b/tp-account-widgets/tpaw-account-settings.c
@@ -1549,18 +1549,15 @@ tpaw_account_settings_parameter_is_valid (
!tpaw_account_settings_is_unset (settings, param))
{
GVariant *account_params;
- GVariant *v;
account_params = tp_account_dup_parameters (settings->priv->account);
- v = g_variant_lookup_value (account_params, param, NULL);
- g_variant_unref (account_params);
-
- if (v != NULL)
+ if (tp_vardict_has_key (account_params, param))
{
- g_variant_unref (v);
+ g_variant_unref (account_params);
goto test_regex;
}
+ g_variant_unref (account_params);
}
return FALSE;