← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdepim/vivid

« back to all changes in this revision

Viewing changes to mailcommon/filter/mailfilter.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Jonathan Riddell, Rohan Garg, Scott Kitterman
  • Date: 2012-11-21 13:12:36 UTC
  • mfrom: (0.2.33)
  • Revision ID: package-import@ubuntu.com-20121121131236-32ijw9a2txrar80k
Tags: 4:4.9.80-0ubuntu1
[ Jonathan Riddell ]
* New upstream beta release

[ Rohan Garg ]
* Add nepomuk-core-dev to build-deps

[ Scott Kitterman ]
* Add new package, libpimcommon4
  - Add libpimcommon4.install
  - Add to debian/control, including kdepim-dbg and kdepim-dev depends
  - Add to kdepim-dev.install
* Remove usr/bin/backupmail and related files from kmail.install as they are
  not provided by upstream anymore
* Add usr/bin/pimsettingexporter and related files to kmail.install
* Add libnepomukwidgets-dev to build-depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
mailcommon/filter/mailfilter.cpp
26
26
#include "filteraction.h"
27
27
#include "filteractiondict.h"
28
28
#include "filtermanager.h"
29
 
#include "mailutil.h"
30
29
#include "filterlog.h"
31
30
#include "filteractionmissingargumentdialog.h"
32
31
using MailCommon::FilterLog;
33
32
 
 
33
#include "pimcommon/pimutil.h"
 
34
 
34
35
// KDEPIMLIBS headers
35
36
#include <Akonadi/AgentManager>
36
37
 
238
239
  return mApplicability;
239
240
}
240
241
 
241
 
SearchRule::RequiredPart MailFilter::requiredPart() const
 
242
SearchRule::RequiredPart MailFilter::requiredPart(const QString& id) const
242
243
{
243
244
  //find the required message part needed for the filter
244
245
  //this can be either only the Envelope, all Header or the CompleteMessage
245
246
  //Makes the assumption that  Envelope < Header < CompleteMessage
246
247
  int requiredPart = SearchRule::Envelope;
247
248
 
248
 
  if (!bEnabled)
 
249
  if (!bEnabled || !applyOnAccount(id))
249
250
    return SearchRule::Envelope;
250
251
 
251
252
  if (pattern())