[empathy] account-settings: always save the password into the password storage
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] account-settings: always save the password into the password storage
- Date: Fri, 7 Sep 2012 12:33:36 +0000 (UTC)
commit 0c4079edb20dc99d17dc8e2b212f3fca7841357b
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Fri Sep 7 14:25:57 2012 +0200
account-settings: always save the password into the password storage
This ensures that the password is stored with the proper 'remember' value.
libempathy/empathy-account-settings.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index ee0cb34..9c25faf 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -81,7 +81,6 @@ struct _EmpathyAccountSettingsPriv
gboolean ready;
gboolean supports_sasl;
- gboolean password_changed;
gboolean remember_password;
gchar *password;
@@ -833,7 +832,6 @@ empathy_account_settings_unset (EmpathyAccountSettings *settings,
{
g_free (priv->password);
priv->password = NULL;
- priv->password_changed = TRUE;
return;
}
@@ -851,7 +849,6 @@ empathy_account_settings_discard_changes (EmpathyAccountSettings *settings)
g_hash_table_remove_all (priv->parameters);
empathy_account_settings_free_unset_parameters (settings);
- priv->password_changed = FALSE;
g_free (priv->password);
priv->password = g_strdup (priv->password_original);
@@ -1073,7 +1070,6 @@ empathy_account_settings_set (EmpathyAccountSettings *settings,
{
g_free (priv->password);
priv->password = g_variant_dup_string (v, NULL);
- priv->password_changed = TRUE;
}
else
{
@@ -1336,9 +1332,8 @@ empathy_account_settings_account_updated (GObject *source,
goto out;
}
- /* Only set the password in the keyring if the CM supports SASL and
- * it's changed. */
- if (priv->supports_sasl && priv->password_changed)
+ /* Only set the password in the keyring if the CM supports SASL. */
+ if (priv->supports_sasl)
{
if (priv->password != NULL)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]