summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-19 19:54:42 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-19 19:57:20 +0000
commit6a073b02dbfda060142f7d47426fec55c7caba0d (patch)
tree864c64f47e5de77ce4439df766d1ccad8efca9c9
parent94a18ab5bba623418a4c6d331a00e810ea6c91c5 (diff)
downloadtelepathy-mission-control-6a073b02dbfda060142f7d47426fec55c7caba0d.tar.gz
Zero-initialize McdLoadAccountsDatatelepathy-mission-control-5.99.8
Otherwise, holds_setup_lock is sometimes initially nonzero, making us think we have the setup lock when really we don't, and leading to an assertion failure when we try to release it. For some reason I could only reproduce this during distcheck... Reviewed-by: Xavier Claessens
-rw-r--r--src/mcd-account-manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index 8b82e254..d11659aa 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -278,7 +278,7 @@ created_cb (McdStorage *storage,
account = mcd_account_new (am, name, priv->minotaur, plugin);
g_assert (MCD_IS_ACCOUNT (account));
- lad = g_slice_new (McdLoadAccountsData);
+ lad = g_slice_new0 (McdLoadAccountsData);
lad->account_manager = g_object_ref (am);
lad->storage_plugin = g_object_ref (plugin);
lad->account_lock = 1; /* released at the end of this function */