Hello community, here is the log from the commit of package kdepim4 for openSUSE:12.2 checked in at 2012-07-31 14:04:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/kdepim4 (Old) and /work/SRC/openSUSE:12.2/.kdepim4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:12.2/kdepim4/kdepim4.changes 2012-06-25 15:37:32.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.kdepim4.new/kdepim4.changes 2012-07-31 14:05:31.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jul 15 17:41:18 UTC 2012 - ctrippe@opensuse.org + +- Fix the mail duplication when filtering incoming messages, also + several data loss bugs related to filtering should be fixed + (bnc#770012) + +------------------------------------------------------------------- New: ---- fix_mail_filter.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.EUQCIJ/_old 2012-07-31 14:06:14.000000000 +0200 +++ /var/tmp/diff_new_pack.EUQCIJ/_new 2012-07-31 14:06:14.000000000 +0200 @@ -28,6 +28,7 @@ Patch1: akregator-useragent.diff Patch2: desktop-files.diff Patch3: knode-kontact-default.diff +Patch4: fix_mail_filter.diff BuildRequires: fdupes BuildRequires: gpgme-devel BuildRequires: grantlee-devel @@ -63,6 +64,7 @@ %patch1 %patch2 %patch3 +%patch4 -p1 %build %ifarch ppc64 ++++++ fix_mail_filter.diff ++++++ Subject: fix the email duplication when filtering From: Andras Mantia <amantia@kde.org> Bug: bnc#770012 Patch-upstream: kde >= 4.8.5 commit 8846d44b217108351c35f8afd883f72ee88388ec Author: Andras Mantia <amantia@kde.org> Date: Fri Jul 6 12:12:34 2012 +0300 Backport part of the filter fix: this is the actual fix, the rest were optimizations and safety checks, but it is difficult to backport. An unwanted side-effect might be that more data is downloaded than before, based on the type of filters used. FIXED-IN: 4.8.5 CCBUG: 287752 CCBUG: 292283 CCBUG: 288109 CCBUG: 286043 CCBUG: 295484 CCBUG: 302337 CCBUG: 295000 CCBUG: 295684 CCBUG: 293768 CCBUG: 275233 CCBUG: 293918 CCBUG: 284310 CCBUG: 286364 CCBUG: 283682 diff --git a/mailfilteragent/mailfilteragent.cpp b/mailfilteragent/mailfilteragent.cpp index 79b2f9d..5f66e74 100644 --- a/mailfilteragent/mailfilteragent.cpp +++ b/mailfilteragent/mailfilteragent.cpp @@ -110,7 +110,6 @@ void MailFilterAgent::initialCollectionFetchingDone( KJob *job ) Akonadi::CollectionFetchJob *fetchJob = qobject_cast<Akonadi::CollectionFetchJob*>( job ); changeRecorder()->itemFetchScope().setAncestorRetrieval( Akonadi::ItemFetchScope::Parent ); - changeRecorder()->itemFetchScope().setCacheOnly( true ); if (m_filterManager->requiresFullMailBody()) { changeRecorder()->itemFetchScope().fetchFullPayload(); } else { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org