diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-05-10 15:01:07 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-05-10 15:01:07 +0200 |
commit | 19e1588c025f518b20d3169c65ea71b739aea2e8 (patch) | |
tree | 7abd4ccfe84fe64487c15c33bd93f3fbc66b5bab /framework/domain/actions/sinkactions.cpp | |
parent | 3a20cdfdde74716c3748fad28f6f85b07200e222 (diff) | |
download | kube-19e1588c025f518b20d3169c65ea71b739aea2e8.tar.gz kube-19e1588c025f518b20d3169c65ea71b739aea2e8.zip |
Use the capability filter to avoid hardcoding resources
Diffstat (limited to 'framework/domain/actions/sinkactions.cpp')
-rw-r--r-- | framework/domain/actions/sinkactions.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/framework/domain/actions/sinkactions.cpp b/framework/domain/actions/sinkactions.cpp index e8f1824b..354a5aca 100644 --- a/framework/domain/actions/sinkactions.cpp +++ b/framework/domain/actions/sinkactions.cpp | |||
@@ -85,8 +85,8 @@ static ActionHandlerHelper sendMailHandler("org.kde.kube.actions.sendmail", | |||
85 | qWarning() << "Sending a mail: "; | 85 | qWarning() << "Sending a mail: "; |
86 | 86 | ||
87 | Sink::Query query; | 87 | Sink::Query query; |
88 | query += Sink::Query::PropertyFilter("type", "org.kde.mailtransport"); | 88 | query += Sink::Query::CapabilityFilter("transport"); |
89 | query += Sink::Query::PropertyFilter("account", QVariant::fromValue(accountId)); | 89 | query += Sink::Query::AccountFilter(accountId); |
90 | Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(query) | 90 | Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(query) |
91 | .then<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([=](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) { | 91 | .then<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([=](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) { |
92 | if (!resources.isEmpty()) { | 92 | if (!resources.isEmpty()) { |
@@ -120,8 +120,7 @@ static ActionHandlerHelper saveAsDraft("org.kde.kube.actions.save-as-draft", | |||
120 | 120 | ||
121 | if (existingMail.identifier().isEmpty()) { | 121 | if (existingMail.identifier().isEmpty()) { |
122 | Sink::Query query; | 122 | Sink::Query query; |
123 | //TODO replace with capability filter | 123 | query += Sink::Query::CapabilityFilter("drafts"); |
124 | query += Sink::Query::PropertyFilter("type", "org.kde.maildir"); | ||
125 | query += Sink::Query::AccountFilter(accountId); | 124 | query += Sink::Query::AccountFilter(accountId); |
126 | return Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(query) | 125 | return Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(query) |
127 | .then<void, KAsync::Job<void>, Sink::ApplicationDomain::SinkResource>([=](const Sink::ApplicationDomain::SinkResource &resource) -> KAsync::Job<void> { | 126 | .then<void, KAsync::Job<void>, Sink::ApplicationDomain::SinkResource>([=](const Sink::ApplicationDomain::SinkResource &resource) -> KAsync::Job<void> { |