diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-16 17:15:01 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-01 19:54:10 +0100 |
| commit | 9e89a8ed3c54ad4c9ad9cc939c995a7196037889 (patch) | |
| tree | 18b359b7c72ae92f63d7cfbf214ac4f3b9d503f4 | |
| parent | 07d5735d63a0dd1102fcec454159aad36cdbe30a (diff) | |
| download | telepathy-mission-control-9e89a8ed3c54ad4c9ad9cc939c995a7196037889.tar.gz | |
Only ignore passwords in gnome-keyring if Empathy has copied them
When passwords are stored in the Parameters by MC and no
SASLAuthentication handler is used, e.g. under Sugar, we currently
save passwords into gnome-keyring, if enabled at compile time; so, we
want to read them back out of gnome-keyring.
This conflicts slightly with wanting to ignore passwords in gnome-keyring
that are left over from an Empathy 3.0 schema migration that failed
due to fd.o #42088. To avoid failure to authenticate/re-prompt if the
password has been changed on the service side, ignore passwords that
are going to be deleted; but to avoid breaking Sugar, don't ignore
any other passwords we might find in gnome-keyring.
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59468
| -rw-r--r-- | src/mcd-account-manager-default.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c index 8d05fb8c..ef39ba16 100644 --- a/src/mcd-account-manager-default.c +++ b/src/mcd-account-manager-default.c @@ -335,14 +335,14 @@ _get_secrets_from_keyring (const McpAccountStorage *self, "account", account, "param", "password", NULL); + + /* behave as if it had already been deleted, i.e. we never + * actually found it... */ + param = NULL; + value = NULL; } gnome_keyring_found_list_free (empathy_items); - - /* behave as if it had already been deleted, i.e. we never - * actually found it... */ - param = NULL; - value = NULL; } if (param != NULL && value != NULL) |