From 9d8d7a2e4f9cd772fe69dae15c4c21728e974df3 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 7 Jun 2012 09:59:52 +0200 Subject: remove empathy_account_settings_set_* functions They don't buy us much so let's just pass the GVariant directly. Fix some string leaks in empathy-account-widget-irc.c as well. https://bugzilla.gnome.org/show_bug.cgi?id=677545 --- libempathy/empathy-account-settings.c | 104 +++------------------------------- libempathy/empathy-account-settings.h | 18 +----- 2 files changed, 9 insertions(+), 113 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 9f7297b4e..8a0e61fbf 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -1137,121 +1137,31 @@ empathy_account_settings_get_boolean (EmpathyAccountSettings *settings, } void -empathy_account_settings_set_string (EmpathyAccountSettings *settings, +empathy_account_settings_set (EmpathyAccountSettings *settings, const gchar *param, - const gchar *value) + GVariant *v) { EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); g_return_if_fail (param != NULL); - g_return_if_fail (value != NULL); + g_return_if_fail (v != NULL); - if (!tp_strdiff (param, "password") && priv->supports_sasl) + if (!tp_strdiff (param, "password") && priv->supports_sasl && + g_variant_is_of_type (v, G_VARIANT_TYPE_STRING)) { g_free (priv->password); - priv->password = g_strdup (value); + priv->password = g_variant_dup_string (v, NULL); priv->password_changed = TRUE; } else { g_hash_table_insert (priv->parameters, g_strdup (param), - g_variant_ref_sink (g_variant_new_string (value))); + g_variant_ref_sink (v)); } account_settings_remove_from_unset (settings, param); } -void -empathy_account_settings_set_strv (EmpathyAccountSettings *settings, - const gchar *param, - const gchar * const *value) -{ - EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); - - g_return_if_fail (param != NULL); - g_return_if_fail (value != NULL); - - g_hash_table_insert (priv->parameters, g_strdup (param), - g_variant_ref_sink (g_variant_new_strv (value, -1))); - - account_settings_remove_from_unset (settings, param); -} - -void -empathy_account_settings_set_int32 (EmpathyAccountSettings *settings, - const gchar *param, - gint32 value) -{ - EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); - - g_return_if_fail (param != NULL); - - g_hash_table_insert (priv->parameters, g_strdup (param), - g_variant_ref_sink (g_variant_new_int32 (value))); - - account_settings_remove_from_unset (settings, param); -} - -void -empathy_account_settings_set_int64 (EmpathyAccountSettings *settings, - const gchar *param, - gint64 value) -{ - EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); - - g_return_if_fail (param != NULL); - - g_hash_table_insert (priv->parameters, g_strdup (param), - g_variant_ref_sink (g_variant_new_int64 (value))); - - account_settings_remove_from_unset (settings, param); -} - -void -empathy_account_settings_set_uint32 (EmpathyAccountSettings *settings, - const gchar *param, - guint32 value) -{ - EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); - - g_return_if_fail (param != NULL); - - g_hash_table_insert (priv->parameters, g_strdup (param), - g_variant_ref_sink (g_variant_new_uint32 (value))); - - account_settings_remove_from_unset (settings, param); -} - -void -empathy_account_settings_set_uint64 (EmpathyAccountSettings *settings, - const gchar *param, - guint64 value) -{ - EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); - - g_return_if_fail (param != NULL); - - g_hash_table_insert (priv->parameters, g_strdup (param), - g_variant_ref_sink (g_variant_new_uint64 (value))); - - account_settings_remove_from_unset (settings, param); -} - -void -empathy_account_settings_set_boolean (EmpathyAccountSettings *settings, - const gchar *param, - gboolean value) -{ - EmpathyAccountSettingsPriv *priv = GET_PRIV (settings); - - g_return_if_fail (param != NULL); - - g_hash_table_insert (priv->parameters, g_strdup (param), - g_variant_ref_sink (g_variant_new_boolean (value))); - - account_settings_remove_from_unset (settings, param); -} - static void account_settings_display_name_set_cb (GObject *src, GAsyncResult *res, diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h index a4672751b..fef328276 100644 --- a/libempathy/empathy-account-settings.h +++ b/libempathy/empathy-account-settings.h @@ -126,23 +126,9 @@ guint64 empathy_account_settings_get_uint64 (EmpathyAccountSettings *settings, gboolean empathy_account_settings_get_boolean (EmpathyAccountSettings *settings, const gchar *param); -void empathy_account_settings_set_string (EmpathyAccountSettings *settings, - const gchar *param, const gchar *value); -void empathy_account_settings_set_strv (EmpathyAccountSettings *settings, +void empathy_account_settings_set (EmpathyAccountSettings *settings, const gchar *param, - const gchar * const *value); - -void empathy_account_settings_set_int32 (EmpathyAccountSettings *settings, - const gchar *param, gint32 value); -void empathy_account_settings_set_int64 (EmpathyAccountSettings *settings, - const gchar *param, gint64 value); -void empathy_account_settings_set_uint32 (EmpathyAccountSettings *settings, - const gchar *param, guint32 value); -void empathy_account_settings_set_uint64 (EmpathyAccountSettings *settings, - const gchar *param, guint64 value); - -void empathy_account_settings_set_boolean (EmpathyAccountSettings *settings, - const gchar *param, gboolean value); + GVariant *v); gchar *empathy_account_settings_get_icon_name ( EmpathyAccountSettings *settings); -- cgit v1.2.3