From 539a696caf69f7306b15a40f6727a313994c9a1c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 13 Nov 2013 17:45:30 +0000 Subject: [PATCH 14/26] McdAccountManager: don't double-delete accounts from storage McdAccount (via mcd_account_delete_async) is responsible for deleting itself from storage if necessary. McdAccountManager shouldn't second-guess it. --- src/mcd-account-manager.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c index f158292..4f3a8ed 100644 --- a/src/mcd-account-manager.c +++ b/src/mcd-account-manager.c @@ -583,7 +583,6 @@ static void on_account_removed (McdAccount *account, McdAccountManager *account_manager) { McdAccountManagerPrivate *priv = account_manager->priv; - McdStorage *storage = priv->storage; const gchar *name, *object_path; object_path = mcd_account_get_object_path (account); @@ -593,10 +592,6 @@ on_account_removed (McdAccount *account, McdAccountManager *account_manager) name = mcd_account_get_unique_name (account); g_hash_table_remove (priv->accounts, name); - - mcd_storage_delete_account (storage, name); - mcd_account_manager_write_conf_async (account_manager, account, NULL, - NULL); } static inline void -- 1.8.4.3