[Pkg-telepathy-commits] [telepathy-mission-control-6] 216/280: McdStorage: don't forget accounts until the McpAccountStorage says so

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 50247324010cbe6fb9495db71f1feccbc517cdea
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Nov 15 16:31:21 2013 +0000

    McdStorage: don't forget accounts until the McpAccountStorage says so
    
    We shouldn't remove it from the hash table until the storage plugin
    says ::deleted: until then, deletion could fail. This will become
    significant when we start considering deletion of a deleted account to
    be an error.
    
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27727
---
 src/mcd-storage.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/mcd-storage.c b/src/mcd-storage.c
index 66fbd82..ba8420a 100644
--- a/src/mcd-storage.c
+++ b/src/mcd-storage.c
@@ -1816,15 +1816,11 @@ mcd_storage_delete_account (McdStorage *self,
       return;
     }
 
-  g_object_ref (plugin);
-  g_hash_table_remove (self->accounts, account);
 
   /* FIXME: stop ignoring the error (if any), and make this method async
    * in order to pass the error up to McdAccount */
   mcp_account_storage_delete_async (plugin, ma, account, NULL,
       delete_cb, g_strdup (account));
-
-  g_object_unref (plugin);
 }
 
 /*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git