Git commit 8abe17e774e4719027dd91be177b8817da2aef06 by Montel Laurent.
Committed on 31/10/2014 at 22:10.
Pushed by mlaurent into branch 'master'.

Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	agents/followupreminderagent/followupremindermanager.cpp

M  +9    -2    agents/followupreminderagent/followupremindermanager.cpp

http://commits.kde.org/kdepim/8abe17e774e4719027dd91be177b8817da2aef06

diff --cc agents/followupreminderagent/followupremindermanager.cpp
index 9f00555,a0a28c9..622d75d
--- a/agents/followupreminderagent/followupremindermanager.cpp
+++ b/agents/followupreminderagent/followupremindermanager.cpp
@@@ -88,16 -84,22 +88,23 @@@ void FollowUpReminderManager::checkFoll
      }
  =

      //If we move to trash directly =3D> exclude it.
-     if (Akonadi::SpecialMailCollections::self()->specialCollectionType(co=
l) =3D=3D Akonadi::SpecialMailCollections::Trash) {
+     Akonadi::SpecialMailCollections::Type type =3D Akonadi::SpecialMailCo=
llections::self()->specialCollectionType(col);
+     if (type =3D=3D Akonadi::SpecialMailCollections::Trash)
          return;
 +    }
      //Exclude outbox too
-     if (Akonadi::SpecialMailCollections::self()->specialCollectionType(co=
l) =3D=3D Akonadi::SpecialMailCollections::Outbox) {
+     if (type =3D=3D Akonadi::SpecialMailCollections::Outbox)
+         return;
+     if (type =3D=3D Akonadi::SpecialMailCollections::Drafts)
+         return;
+     if (type =3D=3D Akonadi::SpecialMailCollections::Templates)
+         return;
+     if (type =3D=3D Akonadi::SpecialMailCollections::SentMail)
          return;
 -
 +    }
  =

      FollowUpReminderJob *job =3D new FollowUpReminderJob(this);
 -    connect(job, SIGNAL(finished(QString,Akonadi::Item::Id)), SLOT(slotCh=
eckFollowUpFinished(QString,Akonadi::Item::Id)));
 +    connect(job, &FollowUpReminderJob::finished, this, &FollowUpReminderM=
anager::slotCheckFollowUpFinished);
      job->setItem(item);
      job->start();
  }