[Bug 259574] conflict resolution box appears a lot

[András Manţia]

https://bugs.kde.org/show_bug.cgi?id=259574

--- Comment #59 from András Manţia <amantia at kde.org> ---
Git commit a2adaa32fec765995b7241a7fb00c5876c82f842 by Andras Mantia.
Committed on 14/10/2012 at 00:25.
Pushed by amantia into branch 'KDE/4.9'.

Disable revision check(conflict checking) if only flags were changed.
That is not very important and can be triggered relatively easily with reading
mails while a filter is active.

For the bugs where I CC'd, please see if you can still reproduce it (the change
affects
only when marking manually conflicted with marking the mail by a filter).
Related: bug 286048

FIXED-IN: 4.9.3
(cherry picked from commit 21d7ebcfa071653ee7a7c184d45b344fd3bb8586)

M  +1    -0    mailfilteragent/filtermanager.cpp

http://commits.kde.org/kdepim/a2adaa32fec765995b7241a7fb00c5876c82f842

-- 
You are receiving this mail because:
You are the assignee for the bug.