From ecc2a18e1afc1b99df6725066c9ae552d09e90d8 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 30 Dec 2015 18:01:58 +0100 Subject: Centralize where we create the stores --- examples/maildirresource/maildirresource.cpp | 6 ++---- examples/maildirresource/maildirresource.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'examples/maildirresource') diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp index 273b996..b49a27e 100644 --- a/examples/maildirresource/maildirresource.cpp +++ b/examples/maildirresource/maildirresource.cpp @@ -212,11 +212,9 @@ KAsync::Job MaildirResource::synchronizeWithSource(Akonadi2::Storage &main }); } -KAsync::Job MaildirResource::replay(const QByteArray &type, const QByteArray &key, const QByteArray &value) +KAsync::Job MaildirResource::replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) { - //This results in a deadlock during sync - Akonadi2::Storage store(Akonadi2::storageLocation(), mResourceInstanceIdentifier + ".synchronization", Akonadi2::Storage::ReadWrite); - auto synchronizationTransaction = store.createTransaction(Akonadi2::Storage::ReadWrite); + auto synchronizationTransaction = synchronizationStore.createTransaction(Akonadi2::Storage::ReadWrite); Trace() << "Replaying " << key << type; if (type == ENTITY_TYPE_FOLDER) { diff --git a/examples/maildirresource/maildirresource.h b/examples/maildirresource/maildirresource.h index 48eac67..389b7f4 100644 --- a/examples/maildirresource/maildirresource.h +++ b/examples/maildirresource/maildirresource.h @@ -38,7 +38,7 @@ public: KAsync::Job synchronizeWithSource(Akonadi2::Storage &mainStore, Akonadi2::Storage &synchronizationStore) Q_DECL_OVERRIDE; static void removeFromDisk(const QByteArray &instanceIdentifier); private: - KAsync::Job replay(const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE; + KAsync::Job replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE; void synchronizeFolders(Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction); void synchronizeMails(Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction, const QString &folder); -- cgit v1.2.3