telepathy-mission-control: McdAccountManager: don' t double-delete accounts from storage
Simon McVittie
smcv at kemper.freedesktop.org
Thu Jan 30 04:34:40 PST 2014
Module: telepathy-mission-control
Branch: master
Commit: cae73ae1d7634b761f5121298359b6f45ebfbe25
URL: http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=cae73ae1d7634b761f5121298359b6f45ebfbe25
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Wed Nov 13 17:45:30 2013 +0000
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.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27727
---
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 86e2d8b..3f4427d 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -597,7 +597,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);
@@ -607,10 +606,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
More information about the telepathy-commits
mailing list