summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-08-30 18:12:06 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-09-06 10:50:14 +0100
commitbd56ee0e36a681ee50d3e02d4f158bbc5df462f1 (patch)
treea06b5ec1738a45f54935a4e8fc189c71b2d02274
parentefc15381535a2d94eeec2b19651302768f65d0ad (diff)
downloadtelepathy-mission-control-bd56ee0e36a681ee50d3e02d4f158bbc5df462f1.tar.gz
Default account backend: when deleting from the keyring, remove from secrets
Otherwise we'd just delete it, then (because it's still in secrets) re-commit it! Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42088 Cherry-picked-from: 16e4507c5001f6f45158ef3d0b46998fa8c1ca2a
-rw-r--r--src/mcd-account-manager-default.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c
index 6989d62a..22eb29eb 100644
--- a/src/mcd-account-manager-default.c
+++ b/src/mcd-account-manager-default.c
@@ -78,11 +78,13 @@ _delete_from_keyring (const McpAccountStorage *self,
/* flag the whole account as purged */
gchar *removed = g_strdup (account);
g_hash_table_replace (amd->removed_accounts, removed, removed);
+ g_key_file_remove_group (amd->secrets, removed, NULL);
}
else
{
/* remember to forget this one param */
g_key_file_set_value (amd->removed, account, key, "");
+ g_key_file_remove_key (amd->secrets, account, key, NULL);
}
}