From 5999d678c2156e04b9c1db3cf1a406adb467810c Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 3 Aug 2011 12:52:08 +0200 Subject: [PATCH] account-manager-default: always delete secret keys from both locations This ensures that the key is actually removed even it has been tagged as secret after is removal. https://bugs.freedesktop.org/show_bug.cgi?id=39796 --- src/mcd-account-manager-default.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c index 9e81104..86e0abc 100644 --- a/src/mcd-account-manager-default.c +++ b/src/mcd-account-manager-default.c @@ -525,10 +525,9 @@ _delete (const McpAccountStorage *self, gboolean save = FALSE; #if ENABLE_GNOME_KEYRING - if (mcp_account_manager_parameter_is_secret (am, account, key)) - save = g_key_file_remove_key (amd->secrets, account, key, NULL); - else - save = g_key_file_remove_key (amd->keyfile, account, key, NULL); + save = g_key_file_remove_key (amd->secrets, account, key, NULL); + if (g_key_file_remove_key (amd->keyfile, account, key, NULL)) + save = TRUE; #else save = g_key_file_remove_key (amd->keyfile, account, key, NULL); #endif -- 1.7.4.1