[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] agents/followupreminderagent: Merge remote-tracking branch 'origin/KDE/4.14'
From:       Montel Laurent <montel () kde ! org>
Date:       2014-10-31 22:11:03
Message-ID: E1XkKPP-0003tE-2t () scm ! kde ! org
[Download RAW message or body]

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 => exclude it.
-     if (Akonadi::SpecialMailCollections::self()->specialCollectionType(col) == \
Akonadi::SpecialMailCollections::Trash) { +     Akonadi::SpecialMailCollections::Type \
type = Akonadi::SpecialMailCollections::self()->specialCollectionType(col); +     if \
(type == Akonadi::SpecialMailCollections::Trash)  return;
 +    }
      //Exclude outbox too
-     if (Akonadi::SpecialMailCollections::self()->specialCollectionType(col) == \
Akonadi::SpecialMailCollections::Outbox) { +     if (type == \
Akonadi::SpecialMailCollections::Outbox) +         return;
+     if (type == Akonadi::SpecialMailCollections::Drafts)
+         return;
+     if (type == Akonadi::SpecialMailCollections::Templates)
+         return;
+     if (type == Akonadi::SpecialMailCollections::SentMail)
          return;
 -
 +    }
  
      FollowUpReminderJob *job = new FollowUpReminderJob(this);
 -    connect(job, SIGNAL(finished(QString,Akonadi::Item::Id)), \
SLOT(slotCheckFollowUpFinished(QString,Akonadi::Item::Id)));  +    connect(job, \
&FollowUpReminderJob::finished, this, \
&FollowUpReminderManager::slotCheckFollowUpFinished);  job->setItem(item);
      job->start();
  }


[prev in list] [next in list] [prev in thread] [next in thread]