diff options
author | Jonny Lamb <jonnylamb@gnome.org> | 2010-12-22 20:08:08 +0800 |
---|---|---|
committer | Jonny Lamb <jonnylamb@gnome.org> | 2011-01-26 21:38:59 +0800 |
commit | 7533ed40284fe574e0752b12a723b4af99c8ff3d (patch) | |
tree | 7037f729b6b7e3d685d092f843db9faf69f7bce3 /libempathy | |
parent | bd5957d475411222883d93a87dd228a2ce20b2a0 (diff) | |
download | gsoc2013-empathy-7533ed40284fe574e0752b12a723b4af99c8ff3d.tar gsoc2013-empathy-7533ed40284fe574e0752b12a723b4af99c8ff3d.tar.gz gsoc2013-empathy-7533ed40284fe574e0752b12a723b4af99c8ff3d.tar.bz2 gsoc2013-empathy-7533ed40284fe574e0752b12a723b4af99c8ff3d.tar.lz gsoc2013-empathy-7533ed40284fe574e0752b12a723b4af99c8ff3d.tar.xz gsoc2013-empathy-7533ed40284fe574e0752b12a723b4af99c8ff3d.tar.zst gsoc2013-empathy-7533ed40284fe574e0752b12a723b4af99c8ff3d.zip |
account-settings: only remove the MC password param if set in the keyring OK
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'libempathy')
-rw-r--r-- | libempathy/empathy-account-settings.c | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index e0474e99a..2ee1a3933 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -421,13 +421,40 @@ empathy_account_settings_get_password_cb (GObject *source, } static void +empathy_account_settings_migrate_password_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + TpAccount *account = TP_ACCOUNT (source); + GError *error = NULL; + EmpathyAccountSettings *self = user_data; + EmpathyAccountSettingsPriv *priv = GET_PRIV (self); + GHashTable *empty; + const gchar *unset[] = { "password", NULL }; + + if (!empathy_keyring_set_password_finish (account, result, &error)) + { + DEBUG ("Failed to set password: %s", error->message); + g_clear_error (&error); + return; + } + + /* Now clear the password MC has stored. */ + empty = tp_asv_new (NULL, NULL); + tp_account_update_parameters_async (priv->account, + empty, unset, NULL, NULL); + + g_hash_table_remove (priv->parameters, "password"); + + g_hash_table_unref (empty); +} + +static void empathy_account_settings_try_migrating_password (EmpathyAccountSettings *self) { EmpathyAccountSettingsPriv *priv = GET_PRIV (self); const GValue *v; const gchar *password; - const gchar *unset[] = { "password", NULL }; - GHashTable *empty; if (!priv->supports_sasl || empathy_account_settings_get ( self, "password") == NULL) @@ -452,7 +479,7 @@ empathy_account_settings_try_migrating_password (EmpathyAccountSettings *self) return; empathy_keyring_set_password_async (priv->account, password, - NULL, NULL); + empathy_account_settings_migrate_password_cb, self); /* We don't want to request the password again, we * already know it. */ @@ -460,15 +487,6 @@ empathy_account_settings_try_migrating_password (EmpathyAccountSettings *self) priv->password = g_strdup (password); priv->password_original = g_strdup (password); - - /* Now clear the password MC has stored. */ - empty = tp_asv_new (NULL, NULL); - tp_account_update_parameters_async (priv->account, - empty, unset, NULL, NULL); - - g_hash_table_remove (priv->parameters, "password"); - - g_hash_table_unref (empty); } static void |